diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 15:58:51 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 05:57:36 -0400 |
commit | b65b4781fbd5846a82cdac0c32818af1a7452d1f (patch) | |
tree | 532f95a901c0d7dcd1d628e68d7984f09750bb4d /arch/arm/mach-pxa | |
parent | be370302742ff9948f2a42b15cb2ba174d97b930 (diff) |
ARM: Remove 'node' argument form arch_adjust_zones()
Since we no longer support discontigmem, node is always zero, so
remove this argument.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/cm-x2xx-pci.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-pxa/include/mach/memory.h | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/mach-pxa/cm-x2xx-pci.c b/arch/arm/mach-pxa/cm-x2xx-pci.c index 161fc2d61207..0f3130599770 100644 --- a/arch/arm/mach-pxa/cm-x2xx-pci.c +++ b/arch/arm/mach-pxa/cm-x2xx-pci.c | |||
@@ -35,7 +35,7 @@ static int cmx2xx_it8152_irq_gpio; | |||
35 | * This is really ugly and we need a better way of specifying | 35 | * This is really ugly and we need a better way of specifying |
36 | * DMA-capable regions of memory. | 36 | * DMA-capable regions of memory. |
37 | */ | 37 | */ |
38 | void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size, | 38 | void __init cmx2xx_pci_adjust_zones(unsigned long *zone_size, |
39 | unsigned long *zhole_size) | 39 | unsigned long *zhole_size) |
40 | { | 40 | { |
41 | unsigned int sz = SZ_64M >> PAGE_SHIFT; | 41 | unsigned int sz = SZ_64M >> PAGE_SHIFT; |
@@ -46,7 +46,7 @@ void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size, | |||
46 | /* | 46 | /* |
47 | * Only adjust if > 64M on current system | 47 | * Only adjust if > 64M on current system |
48 | */ | 48 | */ |
49 | if (node || (zone_size[0] <= sz)) | 49 | if (zone_size[0] <= sz) |
50 | return; | 50 | return; |
51 | 51 | ||
52 | zone_size[1] = zone_size[0] - sz; | 52 | zone_size[1] = zone_size[0] - sz; |
diff --git a/arch/arm/mach-pxa/include/mach/memory.h b/arch/arm/mach-pxa/include/mach/memory.h index 81fd4a081c82..92361a66b223 100644 --- a/arch/arm/mach-pxa/include/mach/memory.h +++ b/arch/arm/mach-pxa/include/mach/memory.h | |||
@@ -18,11 +18,10 @@ | |||
18 | #define PHYS_OFFSET UL(0xa0000000) | 18 | #define PHYS_OFFSET UL(0xa0000000) |
19 | 19 | ||
20 | #if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) | 20 | #if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) |
21 | void cmx2xx_pci_adjust_zones(int node, unsigned long *size, | 21 | void cmx2xx_pci_adjust_zones(unsigned long *size, unsigned long *holes); |
22 | unsigned long *holes); | ||
23 | 22 | ||
24 | #define arch_adjust_zones(node, size, holes) \ | 23 | #define arch_adjust_zones(size, holes) \ |
25 | cmx2xx_pci_adjust_zones(node, size, holes) | 24 | cmx2xx_pci_adjust_zones(size, holes) |
26 | 25 | ||
27 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) | 26 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) |
28 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | 27 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) |