diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 09:47:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-13 09:47:07 -0700 |
| commit | 7775c9753b94fe429dc4323360d6502c95e0dd6e (patch) | |
| tree | 5e89c5d2186e52591eb1945213ccb812e0411d5d /arch/parisc/kernel/perf_asm.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/kernel/perf_asm.S')
| -rw-r--r-- | arch/parisc/kernel/perf_asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/kernel/perf_asm.S b/arch/parisc/kernel/perf_asm.S index d411dfb5b6d1..fa6ea99bb324 100644 --- a/arch/parisc/kernel/perf_asm.S +++ b/arch/parisc/kernel/perf_asm.S @@ -43,7 +43,7 @@ ; The coprocessor only needs to be enabled when ; starting/stopping the coprocessor with the pmenb/pmdis. ; - __HEAD + .text ENTRY(perf_intrigue_enable_perf_counters) .proc |