diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 20:58:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 10:57:36 +0100 |
| commit | b65b4781fbd5846a82cdac0c32818af1a7452d1f (patch) | |
| tree | 532f95a901c0d7dcd1d628e68d7984f09750bb4d /arch/arm/mach-davinci | |
| parent | be370302742ff9948f2a42b15cb2ba174d97b930 (diff) | |
| download | op-kernel-dev-b65b4781fbd5846a82cdac0c32818af1a7452d1f.zip op-kernel-dev-b65b4781fbd5846a82cdac0c32818af1a7452d1f.tar.gz | |
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 a91edfb..22eb97c 100644 --- a/arch/arm/mach-davinci/include/mach/memory.h +++ b/arch/arm/mach-davinci/include/mach/memory.h @@ -48,19 +48,16 @@ * below 128M */ static inline void -__arch_adjust_zones(int node, unsigned long *size, unsigned long *holes) +__arch_adjust_zones(unsigned long *size, unsigned long *holes) { unsigned int sz = (128<<20) >> PAGE_SHIFT; - if (node != 0) - sz = 0; - size[1] = size[0] - sz; size[0] = sz; } -#define arch_adjust_zones(node, zone_size, holes) \ - if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, zone_size, holes) +#define arch_adjust_zones(zone_size, holes) \ + if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(zone_size, holes) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1) #define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20)) |
