UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Mike Rapoport 2008-05-12 06:41:13 +01:00 committed by Russell King
parent 0b0a9df603
commit 5855a1e3c0
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/mach-pxa/cm-x270-pci.c
View File

@ -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)) if (node || (zone_size[0] <= sz))
return; return;
zone_size[1] = zone_size[0] - sz; zone_size[1] = zone_size[0] - sz;
zone_size[0] = sz; zone_size[0] = sz;
zhole_size[1] = zhole_size[0]; zhole_size[1] = zhole_size[0];
zhole_size[0] = 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)