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-ixp4xx | |
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-ixp4xx')
-rw-r--r-- | arch/arm/mach-ixp4xx/common-pci.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/memory.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-ixp4xx/common-pci.c b/arch/arm/mach-ixp4xx/common-pci.c index e3181534c7f9..333d04c53650 100644 --- a/arch/arm/mach-ixp4xx/common-pci.c +++ b/arch/arm/mach-ixp4xx/common-pci.c | |||
@@ -348,7 +348,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) | |||
348 | * This is really ugly and we need a better way of specifying | 348 | * This is really ugly and we need a better way of specifying |
349 | * DMA-capable regions of memory. | 349 | * DMA-capable regions of memory. |
350 | */ | 350 | */ |
351 | void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size, | 351 | void __init ixp4xx_adjust_zones(unsigned long *zone_size, |
352 | unsigned long *zhole_size) | 352 | unsigned long *zhole_size) |
353 | { | 353 | { |
354 | unsigned int sz = SZ_64M >> PAGE_SHIFT; | 354 | unsigned int sz = SZ_64M >> PAGE_SHIFT; |
@@ -356,7 +356,7 @@ void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size, | |||
356 | /* | 356 | /* |
357 | * Only adjust if > 64M on current system | 357 | * Only adjust if > 64M on current system |
358 | */ | 358 | */ |
359 | if (node || (zone_size[0] <= sz)) | 359 | if (zone_size[0] <= sz) |
360 | return; | 360 | return; |
361 | 361 | ||
362 | zone_size[1] = zone_size[0] - sz; | 362 | zone_size[1] = zone_size[0] - sz; |
diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h index 98f5e5e20980..0136eaa29224 100644 --- a/arch/arm/mach-ixp4xx/include/mach/memory.h +++ b/arch/arm/mach-ixp4xx/include/mach/memory.h | |||
@@ -16,10 +16,10 @@ | |||
16 | 16 | ||
17 | #if !defined(__ASSEMBLY__) && defined(CONFIG_PCI) | 17 | #if !defined(__ASSEMBLY__) && defined(CONFIG_PCI) |
18 | 18 | ||
19 | void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); | 19 | void ixp4xx_adjust_zones(unsigned long *size, unsigned long *holes); |
20 | 20 | ||
21 | #define arch_adjust_zones(node, size, holes) \ | 21 | #define arch_adjust_zones(size, holes) \ |
22 | ixp4xx_adjust_zones(node, size, holes) | 22 | ixp4xx_adjust_zones(size, holes) |
23 | 23 | ||
24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) | 24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) |
25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | 25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) |