The patch titled
scsi/scsi.h: protect scsi_to_u32 function by ifdef __KERNEL__
has been added to the -mm tree. Its filename is
scsi-scsih-protect-scsi_to_u32-function-by-ifdef-__kernel__.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: scsi/scsi.h: protect scsi_to_u32 function by ifdef __KERNEL__
From: Ismail Donmez <ismail@xxxxxxxxxxxxx>
include/scsi/scsi.h defines scsi_to_u32 function like this:
static inline u32 scsi_to_u32(u8 *ptr)
But the definition of u8 is protected by ifdef __KERNEL__ in asm/types.h
hence this whole function should be procted as well. This fixes
compilation of cdrtools with latest kernel-headers GIT tree.
Signed-off-by: Ismail Donmez <ismail@xxxxxxxxxxxxx>
Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
include/scsi/scsi.h | 2 ++
1 file changed, 2 insertions(+)
diff -puN include/scsi/scsi.h~scsi-scsih-protect-scsi_to_u32-function-by-ifdef-__kernel__ include/scsi/scsi.h
--- a/include/scsi/scsi.h~scsi-scsih-protect-scsi_to_u32-function-by-ifdef-__kernel__
+++ a/include/scsi/scsi.h
@@ -429,10 +429,12 @@ struct scsi_lun {
/* Used to obtain the PCI location of a device */
#define SCSI_IOCTL_GET_PCI 0x5387
+#ifdef __KERNEL__
/* Pull a u32 out of a SCSI message (using BE SCSI conventions) */
static inline u32 scsi_to_u32(u8 *ptr)
{
return (ptr[0]<<24) + (ptr[1]<<16) + (ptr[2]<<8) + ptr[3];
}
+#endif
#endif /* _SCSI_SCSI_H */
_
Patches currently in -mm which might be from ismail@xxxxxxxxxxxxx are
scsi-scsih-protect-scsi_to_u32-function-by-ifdef-__kernel__.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
