Update of /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/pci
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30292/ruby-2.6/drivers/pci
Modified Files:
proc.c
Log Message:
sync to 2.6.7
Index: proc.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/ruby-2.6/drivers/pci/proc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- proc.c 25 May 2004 05:26:48 -0000 1.5
+++ proc.c 17 Jun 2004 10:44:52 -0000 1.6
@@ -97,7 +97,7 @@
if ((pos & 3) && cnt > 2) {
unsigned short val;
pci_read_config_word(dev, pos, &val);
- __put_user(cpu_to_le16(val), (unsigned short *) buf);
+ __put_user(cpu_to_le16(val), (unsigned short __user *) buf);
buf += 2;
pos += 2;
cnt -= 2;
@@ -106,7 +106,7 @@
while (cnt >= 4) {
unsigned int val;
pci_read_config_dword(dev, pos, &val);
- __put_user(cpu_to_le32(val), (unsigned int *) buf);
+ __put_user(cpu_to_le32(val), (unsigned int __user *) buf);
buf += 4;
pos += 4;
cnt -= 4;
@@ -115,7 +115,7 @@
if (cnt >= 2) {
unsigned short val;
pci_read_config_word(dev, pos, &val);
- __put_user(cpu_to_le16(val), (unsigned short *) buf);
+ __put_user(cpu_to_le16(val), (unsigned short __user *) buf);
buf += 2;
pos += 2;
cnt -= 2;
@@ -172,7 +172,7 @@
if ((pos & 3) && cnt > 2) {
unsigned short val;
- __get_user(val, (unsigned short *) buf);
+ __get_user(val, (unsigned short __user *) buf);
pci_write_config_word(dev, pos, le16_to_cpu(val));
buf += 2;
pos += 2;
@@ -181,7 +181,7 @@
while (cnt >= 4) {
unsigned int val;
- __get_user(val, (unsigned int *) buf);
+ __get_user(val, (unsigned int __user *) buf);
pci_write_config_dword(dev, pos, le32_to_cpu(val));
buf += 4;
pos += 4;
@@ -190,7 +190,7 @@
if (cnt >= 2) {
unsigned short val;
- __get_user(val, (unsigned short *) buf);
+ __get_user(val, (unsigned short __user *) buf);
pci_write_config_word(dev, pos, le16_to_cpu(val));
buf += 2;
pos += 2;
|
