diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-18 02:35:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-06-18 02:35:56 -0700 |
| commit | 5b578afe7c318cfa15f7bd3f89f16d21540fb9c5 (patch) | |
| tree | bf4e9b642fbcc96132eadcbf543695c6eb009af7 /include/linux | |
| parent | cb32fa295e33dec28e01b1c3224bd90e90bbebe6 (diff) | |
| parent | be71e25ff1c286bbc42b2a9ab5b4dc4fdefdb30c (diff) | |
Merge ppc970.osdl.org:/home/torvalds/v2.6/v2.6.7
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/fb.h | 4 | ||||
| -rw-r--r-- | include/linux/ipmi.h | 4 | ||||
| -rw-r--r-- | include/linux/nfs4_mount.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/fb.h b/include/linux/fb.h index c4984007a726..cc7f14febf7c 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -459,8 +459,8 @@ struct fb_ops { /* For framebuffers with strange non linear layouts or that do not * work with normal memory mapped access */ - ssize_t (*fb_read)(struct file *file, char *buf, size_t count, loff_t *ppos); - ssize_t (*fb_write)(struct file *file, const char *buf, size_t count, loff_t *ppos); + ssize_t (*fb_read)(struct file *file, char __user *buf, size_t count, loff_t *ppos); + ssize_t (*fb_write)(struct file *file, const char __user *buf, size_t count, loff_t *ppos); /* checks var and eventually tweaks it to something supported, * DO NOT MODIFY PAR */ diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index a21d4a824fe0..91e49f83268c 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h @@ -498,7 +498,7 @@ int ipmi_addr_equal(struct ipmi_addr *addr1, struct ipmi_addr *addr2); /* Messages sent to the interface are this format. */ struct ipmi_req { - unsigned char *addr; /* Address to send the message to. */ + unsigned char __user *addr; /* Address to send the message to. */ unsigned int addr_len; long msgid; /* The sequence number for the message. This @@ -549,7 +549,7 @@ struct ipmi_recv int recv_type; /* Is this a command, response or an asyncronous event. */ - unsigned char *addr; /* Address the message was from is put + unsigned char __user *addr; /* Address the message was from is put here. The caller must supply the memory. */ unsigned int addr_len; /* The size of the address buffer. diff --git a/include/linux/nfs4_mount.h b/include/linux/nfs4_mount.h index 9a782c2bbdd3..26b4c83f831d 100644 --- a/include/linux/nfs4_mount.h +++ b/include/linux/nfs4_mount.h @@ -20,7 +20,7 @@ struct nfs_string { unsigned int len; - const char* data; + const char __user * data; }; struct nfs4_mount_data { @@ -45,14 +45,14 @@ struct nfs4_mount_data { struct nfs_string hostname; /* 1 */ /* Server IP address */ unsigned int host_addrlen; /* 1 */ - struct sockaddr* host_addr; /* 1 */ + struct sockaddr __user * host_addr; /* 1 */ /* Transport protocol to use */ int proto; /* 1 */ /* Pseudo-flavours to use for authentication. See RFC2623 */ int auth_flavourlen; /* 1 */ - int *auth_flavours; /* 1 */ + int __user *auth_flavours; /* 1 */ }; /* bits in the flags field */ |