Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 313cbb55 authored by Rod Whitby's avatar Rod Whitby Committed by Russell King
Browse files

[ARM] 3218/1: PAGE_SHIFT undeclared in arch-ixp4xx/memory.h (adjust_zones moved out of line) 



Patch from Rod Whitby

PAGE_SHIFT is undeclared in include/asm-arm/arch-ixp4xx/memory.h, identified by the following kernel compilation error:

CC [M] sound/core/memory.o
In file included from include/asm/memory.h:27,
from include/asm/io.h:28,
from sound/core/memory.c:24:
include/asm/arch/memory.h: In function `__arch_adjust_zones':
include/asm/arch/memory.h:28: error: `PAGE_SHIFT' undeclared (first use
in this function)

This patch replaces my previous attempt at fixing this problem (Patch 3214/1) and is based on the following feedback:

Russell King wrote:
> The error you see came up on SA1100.  The best solution was to move
> the __arch_adjust_zones() function out of line.  I suggest ixp4xx
> does the same.

I have moved the function out of line into arch/arm/mach-ixp4xx/common-pci.c as suggested.

Signed-off-by: default avatarRod Whitby <rod@whitby.id.au>
Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8d27e699

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

+23 −0
Original line number Original line Diff line number Diff line
@@ -341,6 +341,29 @@ int dma_needs_bounce(struct device *dev, dma_addr_t dma_addr, size_t size) 
	return (dev->bus == &pci_bus_type ) && ((dma_addr + size) >= SZ_64M);

	return (dev->bus == &pci_bus_type ) && ((dma_addr + size) >= SZ_64M);

}

}





/*

 * Only first 64MB of memory can be accessed via PCI.

 * We use GFP_DMA to allocate safe buffers to do map/unmap.

 * 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,

	unsigned long *zhole_size)

{

	unsigned int sz = SZ_64M >> PAGE_SHIFT;



	/*

	 * Only adjust if > 64M on current system

	 */

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

		return;



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

	zone_size[0] = sz;

	zhole_size[1] = zhole_size[0];

	zhole_size[0] = 0;

}



void __init ixp4xx_pci_preinit(void)

void __init ixp4xx_pci_preinit(void)

{  

{  

	unsigned long processor_id;

	unsigned long processor_id;

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

+2 −23
Original line number Original line Diff line number Diff line
@@ -16,31 +16,10 @@ 




#ifndef __ASSEMBLY__

#ifndef __ASSEMBLY__





/*

void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes);

 * Only first 64MB of memory can be accessed via PCI.

 * We use GFP_DMA to allocate safe buffers to do map/unmap.

 * This is really ugly and we need a better way of specifying

 * DMA-capable regions of memory.

 */

static inline void __arch_adjust_zones(int node, unsigned long *zone_size, 

	unsigned long *zhole_size) 

{

	unsigned int sz = SZ_64M >> PAGE_SHIFT;



	/*

	 * Only adjust if > 64M on current system

	 */

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

		return;



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

	zone_size[0] = sz;

	zhole_size[1] = zhole_size[0];

	zhole_size[0] = 0;

}





#define arch_adjust_zones(node, size, holes) \

#define arch_adjust_zones(node, size, holes) \

	__arch_adjust_zones(node, size, holes)

	ixp4xx_adjust_zones(node, size, holes)





#define ISA_DMA_THRESHOLD (SZ_64M - 1)

#define ISA_DMA_THRESHOLD (SZ_64M - 1)