Skip to content

Commit

Permalink
[ARM] 5035/1: Ensure that zone adjustment is done only on CM-X270
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mike Rapoport authored and Russell King committed Jun 2, 2008
1 parent 0b0a9df commit 5855a1e
Showing 1 changed file with 14 additions and 12 deletions.
26 changes: 14 additions & 12 deletions arch/arm/mach-pxa/cm-x270-pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 5855a1e

Please sign in to comment.