Commit b65b4781 authored by Russell King's avatar Russell King
Browse files

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

arch/arm/common/sa1111.c

+1 −4
Original line number Diff line number Diff line
@@ -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;



	if (node != 0)

		sz = 0;



	size[1] = size[0] - sz;

	size[0] = sz;

}

arch/arm/include/asm/memory.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ 
#endif



#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)

#error "custom arch_adjust_zones() requires CONFIG_ZONE_DMA"

#endif

arch/arm/mach-davinci/include/mach/memory.h

+3 −6
Original line number Diff line number Diff line
@@ -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))

arch/arm/mach-ixp4xx/common-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -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

 * 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 int sz = SZ_64M >> PAGE_SHIFT;
@@ -356,7 +356,7 @@ void __init ixp4xx_adjust_zones(int node, unsigned long *zone_size, 
	/*

	 * Only adjust if > 64M on current system

	 */

	if (node || (zone_size[0] <= sz))

	if (zone_size[0] <= sz)

		return;



	zone_size[1] = zone_size[0] - sz;

arch/arm/mach-ixp4xx/include/mach/memory.h

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


#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) \

	ixp4xx_adjust_zones(node, size, holes)

#define arch_adjust_zones(size, holes) \

	ixp4xx_adjust_zones(size, holes)



#define ISA_DMA_THRESHOLD (SZ_64M - 1)

#define MAX_DMA_ADDRESS		(PAGE_OFFSET + SZ_64M)