313cbb5519
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: Rod Whitby <rod@whitby.id.au> Signed-off-by: Deepak Saxena <dsaxena@plexity.net> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
40 lines
905 B
C
40 lines
905 B
C
/*
|
|
* linux/include/asm-arm/arch-ixp4xx/memory.h
|
|
*
|
|
* Copyright (c) 2001-2004 MontaVista Software, Inc.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_MEMORY_H
|
|
#define __ASM_ARCH_MEMORY_H
|
|
|
|
#include <asm/sizes.h>
|
|
|
|
/*
|
|
* Physical DRAM offset.
|
|
*/
|
|
#define PHYS_OFFSET UL(0x00000000)
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes);
|
|
|
|
#define arch_adjust_zones(node, size, holes) \
|
|
ixp4xx_adjust_zones(node, size, holes)
|
|
|
|
#define ISA_DMA_THRESHOLD (SZ_64M - 1)
|
|
|
|
#endif
|
|
|
|
/*
|
|
* Virtual view <-> DMA view memory address translations
|
|
* virt_to_bus: Used to translate the virtual address to an
|
|
* address suitable to be passed to set_dma_addr
|
|
* bus_to_virt: Used to convert an address for DMA operations
|
|
* to an address that the kernel can use.
|
|
*
|
|
* These are dummies for now.
|
|
*/
|
|
#define __virt_to_bus(x) __virt_to_phys(x)
|
|
#define __bus_to_virt(x) __phys_to_virt(x)
|
|
|
|
#endif
|