diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-22 12:38:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-22 12:38:40 -0700 |
| commit | 17238005f377888b9d4583835205c77e3d781bb8 (patch) | |
| tree | 9cad40902138d08a2694f87736cfebd031dc9542 /arch/parisc/kernel/pacache.S | |
| parent | 34ea646c9f8c18fd2e4332ff3b2b509f878c56f1 (diff) | |
| parent | 7fe2ac6882f74e8bd5b3891f63c09cb10aee9d03 (diff) | |
| download | blackbird-obmc-linux-17238005f377888b9d4583835205c77e3d781bb8.tar.gz blackbird-obmc-linux-17238005f377888b9d4583835205c77e3d781bb8.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6:
[PARISC] wire up syncfs syscall
[PARISC] wire up the fhandle syscalls
[PARISC] wire up clock_adjtime syscall
[PARISC] wire up fanotify syscalls
[PARISC] prevent speculative re-read on cache flush
[PARISC] only make executable areas executable
[PARISC] fix pacache .size with new binutils
Diffstat (limited to 'arch/parisc/kernel/pacache.S')
| -rw-r--r-- | arch/parisc/kernel/pacache.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index a85823668cba..93ff3d90edd1 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S @@ -817,10 +817,7 @@ ENTRY(purge_kernel_dcache_page) .procend ENDPROC(purge_kernel_dcache_page) - - .export flush_user_dcache_range_asm - -flush_user_dcache_range_asm: +ENTRY(flush_user_dcache_range_asm) .proc .callinfo NO_CALLS .entry @@ -839,6 +836,7 @@ flush_user_dcache_range_asm: .exit .procend +ENDPROC(flush_user_dcache_range_asm) ENTRY(flush_kernel_dcache_range_asm) .proc |
