diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-29 04:24:50 +0200 |
| commit | bac30d1a78d0f11c613968fc8b351a91ed465386 (patch) | |
| tree | e52f3c876522a2f6047a6ec1c27df2e8a79486b8 /include/asm-ppc | |
| parent | [PATCH] powerpc: Kill _machine and hard-coded platform numbers (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-bac30d1a78d0f11c613968fc8b351a91ed465386.tar.xz linux-bac30d1a78d0f11c613968fc8b351a91ed465386.zip | |
Merge ../linux-2.6
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index 538e0c8ab243..a70ba2ee552d 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h @@ -149,8 +149,7 @@ extern int page_is_ram(unsigned long pfn); #define __pa(x) ___pa((unsigned long)(x)) #define __va(x) ((void *)(___va((unsigned long)(x)))) -#define pfn_to_page(pfn) (mem_map + ((pfn) - PPC_PGSTART)) -#define page_to_pfn(page) ((unsigned long)((page) - mem_map) + PPC_PGSTART) +#define ARCH_PFN_OFFSET (PPC_PGSTART) #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT) @@ -175,5 +174,6 @@ extern __inline__ int get_order(unsigned long size) /* We do define AT_SYSINFO_EHDR but don't use the gate mecanism */ #define __HAVE_ARCH_GATE_AREA 1 +#include <asm-generic/memory_model.h> #endif /* __KERNEL__ */ #endif /* _PPC_PAGE_H */ |