Commit 5855a1e3 authored by Mike Rapoport's avatar Mike Rapoport Committed by Russell King

[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: default avatarMike Rapoport <mike@compulab.co.il>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0b0a9df6
...@@ -41,18 +41,20 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size, ...@@ -41,18 +41,20 @@ void __init cmx270_pci_adjust_zones(int node, unsigned long *zone_size,
{ {
unsigned int sz = SZ_64M >> PAGE_SHIFT; unsigned int sz = SZ_64M >> PAGE_SHIFT;
pr_info("Adjusting zones for CM-x270\n"); if (machine_is_armcore()) {
pr_info("Adjusting zones for CM-x270\n");
/*
* Only adjust if > 64M on current system /*
*/ * Only adjust if > 64M on current system
if (node || (zone_size[0] <= sz)) */
return; if (node || (zone_size[0] <= sz))
return;
zone_size[1] = zone_size[0] - sz;
zone_size[0] = sz; zone_size[1] = zone_size[0] - sz;
zhole_size[1] = zhole_size[0]; zone_size[0] = sz;
zhole_size[0] = 0; zhole_size[1] = zhole_size[0];
zhole_size[0] = 0;
}
} }
static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc) static void cmx270_it8152_irq_demux(unsigned int irq, struct irq_desc *desc)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment