lkdtm: fix for CONFIG_SCSI=n
PATCH 1/1 lkdtm: fix for CONFIG_SCSI=n
From: Randy Dunlap <[email protected]>
Fix lkdtm test code for case of CONFIG_SCSI=n, to avoid build errors:
In file included from linux-next-20080618/tests/lkdtm.c:55:linux-next-20080618/include/scsi/scsi_cmnd.h:28:25: warning: "BLK_MAX_CDB" is not defined linux-next-20080618/include/scsi/scsi_cmnd.h:29:3: error: #error MAX_COMMAND_SIZE can not be bigger than BLK_MAX_CDB In file included from linux-next-20080618/tests/lkdtm.c:55:linux-next-20080618/include/scsi/scsi_cmnd.h: In function 'scsi_bidi_cmnd':linux-next-20080618/include/scsi/scsi_cmnd.h:183: error: implicit declaration of function 'blk_bidi_rq' linux-next-20080618/include/scsi/scsi_cmnd.h:184: error: dereferencing pointer to incomplete type linux-next-20080618/include/scsi/scsi_cmnd.h: In function 'scsi_in':linux-next-20080618/include/scsi/scsi_cmnd.h:190: error: dereferencing pointer to incomplete type make[2]: *** [tests/lkdtm.o] Error 1
--- tests/lkdtm.c | 8 ++++++++ 1 file changed, 8 insertions(+)
tests/lkdtm.c +8 -0
@@ -52,7 +52,9 @@#include <linux/init.h> #include <linux/interrupt.h> #include <linux/hrtimer.h> +#ifdef CONFIG_SCSI #include <scsi/scsi_cmnd.h> +#endif #ifdef CONFIG_IDE #include <linux/ide.h>
@@ -175,12 +177,14 @@ static int jp_hrtimer_start(struct hrtimreturn 0 ; } +#ifdef CONFIG_SCSI static int jp_scsi_dispatch_cmd (struct scsi_cmnd *cmd) {lkdtm_handler ();jprobe_return ();return 0 ; } +#endif #ifdef CONFIG_IDE int jp_generic_ide_ioctl(ide_drive_t *drive, struct file *file,
@@ -307,8 +311,12 @@ static int __init lkdtm_module_init(void lkdtm.entry = (kprobe_opcode_t *) jp_hrtimer_start;break ;case SCSI_DISPATCH_CMD : +#ifdef CONFIG_SCSI lkdtm.kp.symbol_name ="scsi_dispatch_cmd" ; lkdtm.entry = (kprobe_opcode_t *) jp_scsi_dispatch_cmd; +#else +printk (KERN_INFO "lkdtm : Crash point not available\n" ); +#endif break ;case IDE_CORE_CP :#ifdef CONFIG_IDE
---
~Randy
Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA
http://linuxplumbersconf.org/