diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 12:47:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 12:47:07 -0400 |
| commit | 7775c9753b94fe429dc4323360d6502c95e0dd6e (patch) | |
| tree | 5e89c5d2186e52591eb1945213ccb812e0411d5d /arch/parisc/lib/lusercopy.S | |
| parent | fa8d84b78be10d0c455dd716f40152bb7003bd5b (diff) | |
| parent | 42a5a8a60a093c359987fd884aec99b9d7f4c084 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
parisc: update my email address
parisc: fix miscompilation of ip_fast_csum with gcc >= 4.3
parisc: fix off by one in setup_sigcontext32
parisc: export empty_zero_page
parisc: export copy_user_page_asm
parisc: move head.S to head.text section
Revert "parisc: fix trivial section name warnings"
Diffstat (limited to 'arch/parisc/lib/lusercopy.S')
| -rw-r--r-- | arch/parisc/lib/lusercopy.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/parisc/lib/lusercopy.S b/arch/parisc/lib/lusercopy.S index b0d885350846..1bd23ccec17b 100644 --- a/arch/parisc/lib/lusercopy.S +++ b/arch/parisc/lib/lusercopy.S | |||
| @@ -33,12 +33,11 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | .text | ||
| 37 | |||
| 36 | #include <asm/assembly.h> | 38 | #include <asm/assembly.h> |
| 37 | #include <asm/errno.h> | 39 | #include <asm/errno.h> |
| 38 | #include <linux/linkage.h> | 40 | #include <linux/linkage.h> |
| 39 | #include <linux/init.h> | ||
| 40 | |||
| 41 | __HEAD | ||
| 42 | 41 | ||
| 43 | /* | 42 | /* |
| 44 | * get_sr gets the appropriate space value into | 43 | * get_sr gets the appropriate space value into |