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-shark | |
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-shark')
-rw-r--r-- | arch/arm/mach-shark/include/mach/memory.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-shark/include/mach/memory.h b/arch/arm/mach-shark/include/mach/memory.h index 3053e5b7f168..d9c4812f1c31 100644 --- a/arch/arm/mach-shark/include/mach/memory.h +++ b/arch/arm/mach-shark/include/mach/memory.h | |||
@@ -19,9 +19,8 @@ | |||
19 | 19 | ||
20 | #ifndef __ASSEMBLY__ | 20 | #ifndef __ASSEMBLY__ |
21 | 21 | ||
22 | static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsigned long *zhole_size) | 22 | static inline void __arch_adjust_zones(unsigned long *zone_size, unsigned long *zhole_size) |
23 | { | 23 | { |
24 | if (node != 0) return; | ||
25 | /* Only the first 4 MB (=1024 Pages) are usable for DMA */ | 24 | /* Only the first 4 MB (=1024 Pages) are usable for DMA */ |
26 | /* See dev / -> .properties in OpenFirmware. */ | 25 | /* See dev / -> .properties in OpenFirmware. */ |
27 | zone_size[1] = zone_size[0] - 1024; | 26 | zone_size[1] = zone_size[0] - 1024; |
@@ -30,8 +29,8 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig | |||
30 | zhole_size[0] = 0; | 29 | zhole_size[0] = 0; |
31 | } | 30 | } |
32 | 31 | ||
33 | #define arch_adjust_zones(node, size, holes) \ | 32 | #define arch_adjust_zones(size, holes) \ |
34 | __arch_adjust_zones(node, size, holes) | 33 | __arch_adjust_zones(size, holes) |
35 | 34 | ||
36 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) | 35 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) |
37 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M) | 36 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M) |