diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /include/asm-powerpc/uaccess.h | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'include/asm-powerpc/uaccess.h')
| -rw-r--r-- | include/asm-powerpc/uaccess.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-powerpc/uaccess.h b/include/asm-powerpc/uaccess.h index 8e798e3758bc..1a0736f8803f 100644 --- a/include/asm-powerpc/uaccess.h +++ b/include/asm-powerpc/uaccess.h | |||
| @@ -380,7 +380,7 @@ static inline unsigned long __copy_from_user_inatomic(void *to, | |||
| 380 | const void __user *from, unsigned long n) | 380 | const void __user *from, unsigned long n) |
| 381 | { | 381 | { |
| 382 | if (__builtin_constant_p(n) && (n <= 8)) { | 382 | if (__builtin_constant_p(n) && (n <= 8)) { |
| 383 | unsigned long ret; | 383 | unsigned long ret = 1; |
| 384 | 384 | ||
| 385 | switch (n) { | 385 | switch (n) { |
| 386 | case 1: | 386 | case 1: |
| @@ -406,7 +406,7 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to, | |||
| 406 | const void *from, unsigned long n) | 406 | const void *from, unsigned long n) |
| 407 | { | 407 | { |
| 408 | if (__builtin_constant_p(n) && (n <= 8)) { | 408 | if (__builtin_constant_p(n) && (n <= 8)) { |
| 409 | unsigned long ret; | 409 | unsigned long ret = 1; |
| 410 | 410 | ||
| 411 | switch (n) { | 411 | switch (n) { |
| 412 | case 1: | 412 | case 1: |