diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-31 10:03:19 -0500 |
commit | ea19006f583b2128ce8338e6bb43aa0eb724a4b9 (patch) | |
tree | 4c859976b6acc1301d2c8822be6f21b0381f45fc /arch/parisc/kernel/pacache.S | |
parent | 8b316a3973f05e572b4edeeda9072987f6bbaa44 (diff) | |
parent | a0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff) |
Merge branch 'master'
Diffstat (limited to 'arch/parisc/kernel/pacache.S')
-rw-r--r-- | arch/parisc/kernel/pacache.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/parisc/kernel/pacache.S b/arch/parisc/kernel/pacache.S index 9534ee17b9be..7a4f07e8d3c3 100644 --- a/arch/parisc/kernel/pacache.S +++ b/arch/parisc/kernel/pacache.S | |||
@@ -621,9 +621,9 @@ __clear_user_page_asm: | |||
621 | 621 | ||
622 | .procend | 622 | .procend |
623 | 623 | ||
624 | .export flush_kernel_dcache_page | 624 | .export flush_kernel_dcache_page_asm |
625 | 625 | ||
626 | flush_kernel_dcache_page: | 626 | flush_kernel_dcache_page_asm: |
627 | .proc | 627 | .proc |
628 | .callinfo NO_CALLS | 628 | .callinfo NO_CALLS |
629 | .entry | 629 | .entry |