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 /arch/arm | |
| parent | 8dc39b883e9497445b53c498be7493c3e43af006 (diff) | |
| download | kernel_samsung_smdk4412-1b12050f17460dc312cfd8cc59c79e181b23062b.tar.gz kernel_samsung_smdk4412-1b12050f17460dc312cfd8cc59c79e181b23062b.tar.bz2 kernel_samsung_smdk4412-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 'arch/arm')
| -rw-r--r-- | arch/arm/common/sa1111.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 39a6eea300a..25387cf4753 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -132,6 +132,17 @@ static struct sa1111_dev_info sa1111_devices[] = { }, }; +void __init sa1111_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; +} + /* * SA1111 interrupt support. Since clearing an IRQ while there are * active IRQs causes the interrupt output to pulse, the upper levels |