diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-25 18:57:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-25 18:57:25 -0800 |
| commit | 840f51ffe126123e748df0f36c411a90db1efd93 (patch) | |
| tree | 81a25939a99b9255777ca447cebc95b6385e61c3 /arch/sparc/include/asm/uaccess_32.h | |
| parent | e2197787efe54c0dcbdc4f6acb6dabb65f27f347 (diff) | |
| parent | 1091ce6215a1cab60c3a4601a569cb727ca8637a (diff) | |
| download | op-kernel-dev-840f51ffe126123e748df0f36c411a90db1efd93.zip op-kernel-dev-840f51ffe126123e748df0f36c411a90db1efd93.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix IRQ ->set_affinity() methods.
sparc: cpumask_of_node() should handle -1 as a node
sparc64: Update defconfig.
sparc: Add missing SW perf fault events.
sparc64: Fully support both performance counters.
sparc64: Add perf callchain support.
sparc: convert to arch_gettimeoffset()
sparc: leds_resource.end assigned to itself in clock_board_probe()
sparc32: Fix page_to_phys().
sparc: Simplify param.h by simply including <asm-generic/param.h>
sparc32: Update defconfig.
SPARC: use helpers for rlimits
sparc: copy_from_user() should not return -EFAULT
Diffstat (limited to 'arch/sparc/include/asm/uaccess_32.h')
| -rw-r--r-- | arch/sparc/include/asm/uaccess_32.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/uaccess_32.h b/arch/sparc/include/asm/uaccess_32.h index 489d2ba..25f1d10 100644 --- a/arch/sparc/include/asm/uaccess_32.h +++ b/arch/sparc/include/asm/uaccess_32.h @@ -274,7 +274,7 @@ static inline unsigned long copy_from_user(void *to, const void __user *from, un if (unlikely(sz != -1 && sz < n)) { copy_from_user_overflow(); - return -EFAULT; + return n; } if (n && __access_ok((unsigned long) from, n)) |
