diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /include/asm-ppc/page.h | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'include/asm-ppc/page.h')
| -rw-r--r-- | include/asm-ppc/page.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-ppc/page.h b/include/asm-ppc/page.h index a18d5e324..000a64416 100644 --- a/include/asm-ppc/page.h +++ b/include/asm-ppc/page.h @@ -13,11 +13,11 @@ /* * these virtual mappings for prep and pmac * on the prep machine the io areas are at different physical locations - * than their virtual address. On the pmac the io areas + * than their virtual address. On the pmac and chrp the io areas * are mapped 1-1 virtual/physical. * -- Cort */ -#ifdef CONFIG_PREP +#if defined(CONFIG_PREP) || defined(CONFIG_CHRP) #define KERNELBASE 0x90000000 #endif #ifdef CONFIG_PMAC @@ -81,14 +81,14 @@ typedef unsigned long pgprot_t; #define clear_page(page) memset((void *)(page), 0, PAGE_SIZE) #define copy_page(to,from) memcpy((void *)(to), (void *)(from), PAGE_SIZE) -/* map phys->virtual and virtual->phys */ +/* map phys->virtual and virtual->phys for RAM pages */ #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) -#define MAP_NR(addr) (__pa(addr) >> PAGE_SHIFT) +#define MAP_NR(addr) (__pa(addr) >> PAGE_SHIFT) #define MAP_PAGE_RESERVED (1<<15) -extern __inline__ unsigned long get_prezerod_page(void); +extern unsigned long get_prezerod_page(void); #endif /* __KERNEL__ */ #endif /* __ASSEMBLY__ */ |