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-davinci | |
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-davinci')
-rw-r--r-- | arch/arm/mach-davinci/include/mach/memory.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/mach-davinci/include/mach/memory.h b/arch/arm/mach-davinci/include/mach/memory.h index a91edfb8bee..22eb97c1c30 100644 --- a/arch/arm/mach-davinci/include/mach/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h | |||
@@ -48,19 +48,16 @@ | |||
48 | * below 128M | 48 | * below 128M |
49 | */ | 49 | */ |
50 | static inline void | 50 | static inline void |
51 | __arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) | 51 | __arch_adjust_zones(unsigned long *size, unsigned long *holes) |
52 | { | 52 | { |
53 | unsigned int sz = (128<<20) >> PAGE_SHIFT; | 53 | unsigned int sz = (128<<20) >> PAGE_SHIFT; |
54 | 54 | ||
55 | if (node != 0) | ||
56 | sz = 0; | ||
57 | |||
58 | size[1] = size[0] - sz; | 55 | size[1] = size[0] - sz; |
59 | size[0] = sz; | 56 | size[0] = sz; |
60 | } | 57 | } |
61 | 58 | ||
62 | #define arch_adjust_zones(node, zone_size, holes) \ | 59 | #define arch_adjust_zones(zone_size, holes) \ |
63 | if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes) | 60 | if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(zone_size, holes) |
64 | 61 | ||
65 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) | 62 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) |
66 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20)) | 63 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20)) |