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-shark/include/mach/memory.h | |
| parent | be370302742ff9948f2a42b15cb2ba174d97b930 (diff) | |
| download | blackbird-op-linux-b65b4781fbd5846a82cdac0c32818af1a7452d1f.tar.gz blackbird-op-linux-b65b4781fbd5846a82cdac0c32818af1a7452d1f.zip | |
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/include/mach/memory.h')
| -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 @@ #ifndef __ASSEMBLY__ -static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsigned long *zhole_size) +static inline void __arch_adjust_zones(unsigned long *zone_size, unsigned long *zhole_size) { - if (node != 0) return; /* Only the first 4 MB (=1024 Pages) are usable for DMA */ /* See dev / -> .properties in OpenFirmware. */ zone_size[1] = zone_size[0] - 1024; @@ -30,8 +29,8 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig zhole_size[0] = 0; } -#define arch_adjust_zones(node, size, holes) \ - __arch_adjust_zones(node, size, holes) +#define arch_adjust_zones(size, holes) \ + __arch_adjust_zones(size, holes) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M) |
