diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-16 17:38:40 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-16 17:38:40 +0000 |
| commit | 1b12050f17460dc312cfd8cc59c79e181b23062b (patch) | |
| tree | 5f21465d9eb11f9825d89c3ac225a291f279b1a1 /include | |
| parent | 8dc39b883e9497445b53c498be7493c3e43af006 (diff) | |
| download | kernel-common-1b12050f17460dc312cfd8cc59c79e181b23062b.tar.gz kernel-common-1b12050f17460dc312cfd8cc59c79e181b23062b.tar.bz2 kernel-common-1b12050f17460dc312cfd8cc59c79e181b23062b.zip | |
[ARM] Move zone adjustment for SA1111 on SA11x0 platforms
Unfortunately, using PAGE_SHIFT in asm/arch/memory.h is unsafe, and we
can't include asm/page.h into this file because then we have a circular
dependency. Move the offending code to arch/arm/common/sa1111.c
instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-arm/arch-sa1100/memory.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/include/asm-arm/arch-sa1100/memory.h b/include/asm-arm/arch-sa1100/memory.h index 0fc555b4c912..018a9f0e3986 100644 --- a/include/asm-arm/arch-sa1100/memory.h +++ b/include/asm-arm/arch-sa1100/memory.h @@ -18,20 +18,10 @@ #ifndef __ASSEMBLY__ #ifdef CONFIG_SA1111 -static inline void -__arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) -{ - unsigned int sz = SZ_1M >> PAGE_SHIFT; - - if (node != 0) - sz = 0; - - size[1] = size[0] - sz; - size[0] = sz; -} +void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes); #define arch_adjust_zones(node, size, holes) \ - __arch_adjust_zones(node, size, holes) + sa1111_adjust_zones(node, size, holes) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) |