The patch titled
lkdtm: cleanup headers and module_param/MODULE_PARM_DESC
has been added to the -mm tree. Its filename is
lkdtm-cleanup-headers-and-module_param-module_parm_desc.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: lkdtm: cleanup headers and module_param/MODULE_PARM_DESC
From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Fix module_param/sysfs file permission typo.
Clean up MODULE_PARM_DESC strings to avoid fancy (and incorrect)
formatting.
Fix header includes for lkdtm; add some needed ones, remove unused ones;
and fix this gcc warning:
drivers/misc/lkdtm.c:150: warning: 'struct buffer_head' declared inside parameter list
drivers/misc/lkdtm.c:150: warning: its scope is only this definition or declaration, which is probably not what you want
Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Cc: Ankita Garg <ankita@xxxxxxxxxx>
Cc: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/misc/lkdtm.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff -puN drivers/misc/lkdtm.c~lkdtm-cleanup-headers-and-module_param-module_parm_desc drivers/misc/lkdtm.c
--- a/drivers/misc/lkdtm.c~lkdtm-cleanup-headers-and-module_param-module_parm_desc
+++ a/drivers/misc/lkdtm.c
@@ -44,12 +44,14 @@
*/
#include <linux/kernel.h>
+#include <linux/fs.h>
#include <linux/module.h>
+#include <linux/buffer_head.h>
#include <linux/kprobes.h>
-#include <linux/kallsyms.h>
+#include <linux/list.h>
#include <linux/init.h>
-#include <linux/irq.h>
#include <linux/interrupt.h>
+#include <linux/hrtimer.h>
#include <scsi/scsi_cmnd.h>
#ifdef CONFIG_IDE
@@ -116,16 +118,16 @@ static enum ctype cptype = NONE;
static int count = DEFAULT_COUNT;
module_param(recur_count, int, 0644);
-MODULE_PARM_DESC(recur_count, "Recurcion level for the stack overflow test,\
- default is 10");
+MODULE_PARM_DESC(recur_count, " Recursion level for the stack overflow test, "\
+ "default is 10");
module_param(cpoint_name, charp, 0644);
-MODULE_PARM_DESC(cpoint_name, "Crash Point, where kernel is to be crashed");
-module_param(cpoint_type, charp, 06444);
-MODULE_PARM_DESC(cpoint_type, "Crash Point Type, action to be taken on\
- hitting the crash point");
-module_param(cpoint_count, int, 06444);
-MODULE_PARM_DESC(cpoint_count, "Crash Point Count, number of times the \
- crash point is to be hit to trigger action");
+MODULE_PARM_DESC(cpoint_name, " Crash Point, where kernel is to be crashed");
+module_param(cpoint_type, charp, 0644);
+MODULE_PARM_DESC(cpoint_type, " Crash Point Type, action to be taken on "\
+ "hitting the crash point");
+module_param(cpoint_count, int, 0644);
+MODULE_PARM_DESC(cpoint_count, " Crash Point Count, number of times the "\
+ "crash point is to be hit to trigger action");
unsigned int jp_do_irq(unsigned int irq)
{
_
Patches currently in -mm which might be from randy.dunlap@xxxxxxxxxx are
update-some-docbook-comments.patch
docbook-merge-journal-api-into-filesystemstmpl.patch
lkdtm-cleanup-headers-and-module_param-module_parm_desc.patch
git-dvb.patch
git-ieee1394.patch
mtd-fix-printk-format-warning.patch
git-net.patch
com20020-build-fix.patch
parisc-fix-module_param-iommu-permission.patch
scsi-iscsi-build-failure.patch
pci-i386-style-cleanups.patch
tifm-fix-null-ptr-and-style.patch
kconfig-printk_time-depends-on-printk.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
