Skip to content

L
linux
Commit b65b4781 authored by Russell King's avatar Russell King
Browse files
Options

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent be370302
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 37 deletions
arch/arm/common/sa1111.c
View file @ b65b4781
...@@ -185,13 +185,10 @@ static struct sa1111_dev_info sa1111_devices[] = { ...@@ -185,13 +185,10 @@ static struct sa1111_dev_info sa1111_devices[] = {
}, },
}; };
void __init sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes) void __init sa1111_adjust_zones(unsigned long *size, unsigned long *holes)
{ {
unsigned int sz = SZ_1M >> PAGE_SHIFT; unsigned int sz = SZ_1M >> PAGE_SHIFT;
if (node != 0)
sz = 0;
size[1] = size[0] - sz; size[1] = size[0] - sz;
size[0] = sz; size[0] = sz;
} }
......
arch/arm/include/asm/memory.h
View file @ b65b4781
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
#endif #endif
#ifndef arch_adjust_zones #ifndef arch_adjust_zones
#define arch_adjust_zones(node,size,holes) do { } while (0) #define arch_adjust_zones(size,holes) do { } while (0)
#elif !defined(CONFIG_ZONE_DMA) #elif !defined(CONFIG_ZONE_DMA)
#error "custom arch_adjust_zones() requires CONFIG_ZONE_DMA" #error "custom arch_adjust_zones() requires CONFIG_ZONE_DMA"
#endif #endif
......
arch/arm/mach-davinci/include/mach/memory.h
View file @ b65b4781
...@@ -48,19 +48,16 @@ ...@@ -48,19 +48,16 @@
* below 128M * below 128M
*/ */
static inline void 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; unsigned int sz = (128<<20) >> PAGE_SHIFT;
if (node != 0)
sz = 0;
size[1] = size[0] - sz; size[1] = size[0] - sz;
size[0] = sz; size[0] = sz;
} }
#define arch_adjust_zones(node, zone_size, holes) \ #define arch_adjust_zones(zone_size, holes) \
if ((meminfo.bank[0].size >> 20) > 128) __arch_adjust_zones(node, 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 ISA_DMA_THRESHOLD (PHYS_OFFSET + (128<<20) - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20)) #define MAX_DMA_ADDRESS (PAGE_OFFSET + (128<<20))
......
arch/arm/mach-ixp4xx/common-pci.c
View file @ b65b4781
...@@ -348,7 +348,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) ...@@ -348,7 +348,7 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size)
* This is really ugly and we need a better way of specifying * This is really ugly and we need a better way of specifying
* DMA-capable regions of memory. * DMA-capable regions of memory.
*/ */
void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size, void __init ixp4xx_adjust_zones(unsigned long *zone_size,
unsigned long *zhole_size) unsigned long *zhole_size)
{ {
unsigned int sz = SZ_64M >> PAGE_SHIFT; unsigned int sz = SZ_64M >> PAGE_SHIFT;
...@@ -356,7 +356,7 @@ void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size, ...@@ -356,7 +356,7 @@ void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size,
/* /*
* Only adjust if > 64M on current system * Only adjust if > 64M on current system
*/ */
if (node || (zone_size[0] <= sz)) if (zone_size[0] <= sz)
return; return;
zone_size[1] = zone_size[0] - sz; zone_size[1] = zone_size[0] - sz;
......
arch/arm/mach-ixp4xx/include/mach/memory.h
View file @ b65b4781
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
#if !defined(__ASSEMBLY__) && defined(CONFIG_PCI) #if !defined(__ASSEMBLY__) && defined(CONFIG_PCI)
void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); void ixp4xx_adjust_zones(unsigned long *size, unsigned long *holes);
#define arch_adjust_zones(node, size, holes) \ #define arch_adjust_zones(size, holes) \
ixp4xx_adjust_zones(node, size, holes) ixp4xx_adjust_zones(size, holes)
#define ISA_DMA_THRESHOLD (SZ_64M - 1) #define ISA_DMA_THRESHOLD (SZ_64M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
......
arch/arm/mach-pxa/cm-x2xx-pci.c
View file @ b65b4781
...@@ -35,7 +35,7 @@ static int cmx2xx_it8152_irq_gpio; ...@@ -35,7 +35,7 @@ static int cmx2xx_it8152_irq_gpio;
* This is really ugly and we need a better way of specifying * This is really ugly and we need a better way of specifying
* DMA-capable regions of memory. * DMA-capable regions of memory.
*/ */
void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size, void __init cmx2xx_pci_adjust_zones(unsigned long *zone_size,
unsigned long *zhole_size) unsigned long *zhole_size)
{ {
unsigned int sz = SZ_64M >> PAGE_SHIFT; unsigned int sz = SZ_64M >> PAGE_SHIFT;
...@@ -46,7 +46,7 @@ void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size, ...@@ -46,7 +46,7 @@ void __init cmx2xx_pci_adjust_zones(int node, unsigned long *zone_size,
/* /*
* Only adjust if > 64M on current system * Only adjust if > 64M on current system
*/ */
if (node || (zone_size[0] <= sz)) if (zone_size[0] <= sz)
return; return;
zone_size[1] = zone_size[0] - sz; zone_size[1] = zone_size[0] - sz;
......
arch/arm/mach-pxa/include/mach/memory.h
View file @ b65b4781
...@@ -18,11 +18,10 @@ ...@@ -18,11 +18,10 @@
#define PHYS_OFFSET UL(0xa0000000) #define PHYS_OFFSET UL(0xa0000000)
#if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI) #if !defined(__ASSEMBLY__) && defined(CONFIG_MACH_ARMCORE) && defined(CONFIG_PCI)
void cmx2xx_pci_adjust_zones(int node, unsigned long *size, void cmx2xx_pci_adjust_zones(unsigned long *size, unsigned long *holes);
unsigned long *holes);
#define arch_adjust_zones(node, size, holes) \ #define arch_adjust_zones(size, holes) \
cmx2xx_pci_adjust_zones(node, size, holes) cmx2xx_pci_adjust_zones(size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_64M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M)
......
arch/arm/mach-realview/core.c
View file @ b65b4781
...@@ -61,12 +61,11 @@ void __iomem *gic_cpu_base_addr; ...@@ -61,12 +61,11 @@ void __iomem *gic_cpu_base_addr;
/* /*
* Adjust the zones if there are restrictions for DMA access. * Adjust the zones if there are restrictions for DMA access.
*/ */
void __init realview_adjust_zones(int node, unsigned long *size, void __init realview_adjust_zones(unsigned long *size, unsigned long *hole)
unsigned long *hole)
{ {
unsigned long dma_size = SZ_256M >> PAGE_SHIFT; unsigned long dma_size = SZ_256M >> PAGE_SHIFT;
if (!machine_is_realview_pbx() || node || (size[0] <= dma_size)) if (!machine_is_realview_pbx() || size[0] <= dma_size)
return; return;
size[ZONE_NORMAL] = size[0] - dma_size; size[ZONE_NORMAL] = size[0] - dma_size;
......
arch/arm/mach-realview/include/mach/memory.h
View file @ b65b4781
...@@ -30,10 +30,9 @@ ...@@ -30,10 +30,9 @@
#endif #endif
#if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA) #if !defined(__ASSEMBLY__) && defined(CONFIG_ZONE_DMA)
extern void realview_adjust_zones(int node, unsigned long *size, extern void realview_adjust_zones(unsigned long *size, unsigned long *hole);
unsigned long *hole); #define arch_adjust_zones(size, hole) \
#define arch_adjust_zones(node, size, hole) \ realview_adjust_zones(size, hole)
realview_adjust_zones(node, size, hole)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_256M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_256M)
......
arch/arm/mach-sa1100/include/mach/memory.h
View file @ b65b4781
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#ifdef CONFIG_SA1111 #ifdef CONFIG_SA1111
void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes); void sa1111_adjust_zones(unsigned long *size, unsigned long *holes);
#define arch_adjust_zones(node, size, holes) \ #define arch_adjust_zones(size, holes) \
sa1111_adjust_zones(node, size, holes) sa1111_adjust_zones(size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M)
......
arch/arm/mach-shark/include/mach/memory.h
View file @ b65b4781
...@@ -19,9 +19,8 @@ ...@@ -19,9 +19,8 @@
#ifndef __ASSEMBLY__ #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 */ /* Only the first 4 MB (=1024 Pages) are usable for DMA */
/* See dev / -> .properties in OpenFirmware. */ /* See dev / -> .properties in OpenFirmware. */
zone_size[1] = zone_size[0] - 1024; 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,8 +29,8 @@ static inline void __arch_adjust_zones(int node, unsigned long *zone_size, unsig
zhole_size[0] = 0; zhole_size[0] = 0;
} }
#define arch_adjust_zones(node, size, holes) \ #define arch_adjust_zones(size, holes) \
__arch_adjust_zones(node, size, holes) __arch_adjust_zones(size, holes)
#define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1) #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_4M - 1)
#define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M) #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_4M)
......
arch/arm/mm/init.c
View file @ b65b4781
...@@ -318,7 +318,7 @@ static void __init arm_bootmem_free(struct meminfo *mi) ...@@ -318,7 +318,7 @@ static void __init arm_bootmem_free(struct meminfo *mi)
* Adjust the sizes according to any special requirements for * Adjust the sizes according to any special requirements for
* this machine type. * this machine type.
*/ */
arch_adjust_zones(0, zone_size, zhole_size); arch_adjust_zones(zone_size, zhole_size);
free_area_init_node(0, zone_size, min, zhole_size); free_area_init_node(0, zone_size, min, zhole_size);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7