summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMike Rapoport2008-05-12 07:41:13 +0200
committerRussell King2008-06-02 20:33:28 +0200
commit5855a1e3c0714242b8a1875383b63ccf9bafaab7 (patch)
tree341c5e7c4f3c151c0102d4a1314ae2e20eaf095e /arch
parent[ARM] pxa: separate out power manager and clock registers (diff)
downloadkernel-qcow2-linux-5855a1e3c0714242b8a1875383b63ccf9bafaab7.tar.gz
kernel-qcow2-linux-5855a1e3c0714242b8a1875383b63ccf9bafaab7.tar.xz
kernel-qcow2-linux-5855a1e3c0714242b8a1875383b63ccf9bafaab7.zip
[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')
-rw-r--r--arch/arm/mach-pxa/cm-x270-pci.c26
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 ac7f05f9f3eb..319c9ff3ab9a 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)