[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>

diff --git a/arch/arm/mach-pxa/cm-x270-pci.c b/arch/arm/mach-pxa/cm-x270-pci.c
index ac7f05f9f3eb8ad50722686f7e46da11e8ac9548..319c9ff3ab9a29ca49179fe4f180a9db8c50725b 100644 (file)
--- 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)