summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/linux/cdrom.h4
-rw-r--r--include/linux/fd.h2
-rw-r--r--include/linux/wavefront.h4
3 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index a1727a02c6df..282e9b793e36 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -237,9 +237,9 @@ struct cdrom_read
struct cdrom_read_audio
{
union cdrom_addr addr; /* frame address */
- __u8 addr_format; /* CDROM_LBA or CDROM_MSF */
+ __u8 addr_format; /* CDROM_LBA or CDROM_MSF */
int nframes; /* number of 2352-byte-frames to read at once */
- __u8 *buf; /* frame buffer (size: nframes*2352 bytes) */
+ __u8 __user *buf; /* frame buffer (size: nframes*2352 bytes) */
};
/* This struct is used with the CDROMMULTISESSION ioctl */
diff --git a/include/linux/fd.h b/include/linux/fd.h
index cbbd0f876585..7ce5f01a4de2 100644
--- a/include/linux/fd.h
+++ b/include/linux/fd.h
@@ -339,7 +339,7 @@ struct floppy_raw_cmd {
#define FD_RAW_FAILURE 0x10000 /* command sent to fdc, fdc returned error */
#define FD_RAW_HARDFAILURE 0x20000 /* fdc had to be reset, or timed out */
- void *data;
+ void __user *data;
char *kernel_data; /* location of data buffer in the kernel */
struct floppy_raw_cmd *next; /* used for chaining of raw cmd's
* within the kernel */
diff --git a/include/linux/wavefront.h b/include/linux/wavefront.h
index 746102627662..61bd0fd35240 100644
--- a/include/linux/wavefront.h
+++ b/include/linux/wavefront.h
@@ -534,8 +534,8 @@ typedef struct wf_patch_info {
WF_{GET,SET}_CHANNEL above.
*/
- wavefront_any *hdrptr; /* user-space ptr to hdr bytes */
- UINT16 *dataptr; /* actual sample data */
+ wavefront_any __user *hdrptr; /* user-space ptr to hdr bytes */
+ UINT16 __user *dataptr; /* actual sample data */
wavefront_any hdr; /* kernel-space copy of hdr bytes */
} wavefront_patch_info;