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-realview | |
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-realview')
-rw-r--r-- | arch/arm/mach-realview/core.c | 5 | ||||
-rw-r--r-- | arch/arm/mach-realview/include/mach/memory.h | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-realview/core.c b/arch/arm/mach-realview/core.c index 595be19f8ad5..1195e07c5483 100644 --- a/arch/arm/mach-realview/core.c +++ b/arch/arm/mach-realview/core.c | |||
@@ -61,12 +61,11 @@ void __iomem *gic_cpu_base_addr; | |||
61 | /* | 61 | /* |
62 | * Adjust the zones if there are restrictions for DMA access. | 62 | * Adjust the zones if there are restrictions for DMA access. |
63 | */ | 63 | */ |
64 | void __init realview_adjust_zones(int node, unsigned long *size, | 64 | void __init realview_adjust_zones(unsigned long *size, unsigned long *hole) |
65 | unsigned long *hole) | ||
66 | { | 65 | { |
67 | unsigned long dma_size = SZ_256M >> PAGE_SHIFT; | 66 | unsigned long dma_size = SZ_256M >> PAGE_SHIFT; |
68 | 67 | ||
69 | if (!machine_is_realview_pbx() || node || (size[0] <= dma_size)) | 68 | if (!machine_is_realview_pbx() || size[0] <= dma_size) |
70 | return; | 69 | return; |
71 | 70 | ||
72 | size[ZONE_NORMAL] = size[0] - dma_size; | 71 | size[ZONE_NORMAL] = size[0] - dma_size; |
diff --git a/arch/arm/mach-realview/include/mach/memory.h b/arch/arm/mach-realview/include/mach/memory.h index 2417bbcf97fd..5dafc157b276 100644 --- a/arch/arm/mach-realview/include/mach/memory.h +++ b/arch/arm/mach-realview/include/mach/memory.h | |||
@@ -30,10 +30,9 @@ | |||
30 | #endif | 30 | #endif |
31 | 31 | ||
32 | #if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA) | 32 | #if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA) |
33 | extern void realview_adjust_zones(int node, unsigned long *size, | 33 | extern void realview_adjust_zones(unsigned long *size, unsigned long *hole); |
34 | unsigned long *hole); | 34 | #define arch_adjust_zones(size, hole) \ |
35 | #define arch_adjust_zones(node, size, hole) \ | 35 | realview_adjust_zones(size, hole) |
36 | realview_adjust_zones(node, size, hole) | ||
37 | 36 | ||
38 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1) | 37 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1) |
39 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) | 38 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) |