diff options
| author | Mike Rapoport <mike@compulab.co.il> | 2008-05-12 06:41:13 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-06-02 19:33:28 +0100 |
| commit | 5855a1e3c0714242b8a1875383b63ccf9bafaab7 (patch) | |
| tree | 341c5e7c4f3c151c0102d4a1314ae2e20eaf095e /arch/arm/mach-pxa/cm-x270-pci.c | |
| parent | 0b0a9df6038752674e54e333cd247c877d29aab8 (diff) | |
| download | op-kernel-dev-5855a1e3c0714242b8a1875383b63ccf9bafaab7.zip op-kernel-dev-5855a1e3c0714242b8a1875383b63ccf9bafaab7.tar.gz | |
[ARM] 5035/1: Ensure that zone adjustment is done only on CM-X270
Adjust zones for PCI DMA only if machine_is_armcore() to allow running
the same kernel on different PXA machines.
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x270-pci.c')
| -rw-r--r-- | arch/arm/mach-pxa/cm-x270-pci.c | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c index ac7f05f..319c9ff 100644 --- a/arch/arm/mach-pxa/cm-x270-pci.c +++ b/arch/arm/mach-pxa/cm-x270-pci.c @@ -41,18 +41,20 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size, { unsigned int sz = SZ_64M >> PAGE_SHIFT; - pr_info("Adjusting zones for CM-x270\n"); - - /* - * Only adjust if > 64M on current system - */ - if (node || (zone_size[0] <= sz)) - return; - - zone_size[1] = zone_size[0] - sz; - zone_size[0] = sz; - zhole_size[1] = zhole_size[0]; - zhole_size[0] = 0; + if (machine_is_armcore()) { + pr_info("Adjusting zones for CM-x270\n"); + + /* + * Only adjust if > 64M on current system + */ + if (node || (zone_size[0] <= sz)) + return; + + zone_size[1] = zone_size[0] - sz; + zone_size[0] = sz; + zhole_size[1] = zhole_size[0]; + zhole_size[0] = 0; + } } static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc) |
