diff options
| author | Anton Blanchard <anton@samba.org> | 2011-05-08 21:18:38 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 14:30:42 +1000 |
| commit | d988f0e3f84cb8a4f85ccdbca6f6fefcc37bedcb (patch) | |
| tree | 60feffdec36d0a484b0d8d7d8dbdf5baf73aea7e /arch/powerpc/lib | |
| parent | 37e0c21e9b5b6d6fd38a444762076c84c6170598 (diff) | |
| download | linux-0-day-d988f0e3f84cb8a4f85ccdbca6f6fefcc37bedcb.tar.gz linux-0-day-d988f0e3f84cb8a4f85ccdbca6f6fefcc37bedcb.tar.xz | |
powerpc: Simplify 4k/64k copy_page logic
To make it easier to add optimised versions of copy_page, remove
the 4kB loop for 64kB pages and just do all the work in copy_page.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/copypage_64.S | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/lib/copypage_64.S b/arch/powerpc/lib/copypage_64.S index 4d4eeb9004868..53dcb6b1b708b 100644 --- a/arch/powerpc/lib/copypage_64.S +++ b/arch/powerpc/lib/copypage_64.S @@ -6,6 +6,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ +#include <asm/page.h> #include <asm/processor.h> #include <asm/ppc_asm.h> #include <asm/asm-offsets.h> @@ -15,9 +16,9 @@ PPC64_CACHES: .tc ppc64_caches[TC],ppc64_caches .section ".text" - -_GLOBAL(copy_4K_page) - li r5,4096 /* 4K page size */ +_GLOBAL(copy_page) + lis r5,PAGE_SIZE@h + ori r5,r5,PAGE_SIZE@l BEGIN_FTR_SECTION ld r10,PPC64_CACHES@toc(r2) lwz r11,DCACHEL1LOGLINESIZE(r10) /* log2 of cache line size */ |