diff options
| author | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@parisc-linux.org> | 2007-02-17 00:18:23 -0500 |
| commit | e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7 (patch) | |
| tree | 7e5745bea06675cfce60d6813ee3b4d5e19cbb56 /include/asm-parisc/page.h | |
| parent | 62d0cfcb27cf755cebdc93ca95dabc83608007cd (diff) | |
| parent | cb6efb39163bfb6bb6475fa7c8a5e08e44dbf14a (diff) | |
| download | blackbird-op-linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.tar.gz blackbird-op-linux-e7b3ca08549caccf5d6e1cf066780bf4f0ae77a7.zip | |
Merge branch 'parisc' from /home/kyle/repos/parisc-2.6.git
Conflicts:
arch/parisc/hpux/sys_hpux.c
arch/parisc/mm/ioremap.c
Diffstat (limited to 'include/asm-parisc/page.h')
| -rw-r--r-- | include/asm-parisc/page.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-parisc/page.h b/include/asm-parisc/page.h index 3567208191e3..dcf9047f7fb4 100644 --- a/include/asm-parisc/page.h +++ b/include/asm-parisc/page.h @@ -127,7 +127,11 @@ extern int npmem_ranges; /* This governs the relationship between virtual and physical addresses. * If you alter it, make sure to take care of our various fixed mapping * segments in fixmap.h */ -#define __PAGE_OFFSET (0x10000000) +#ifdef CONFIG_64BIT +#define __PAGE_OFFSET (0x40000000) /* 1GB */ +#else +#define __PAGE_OFFSET (0x10000000) /* 256MB */ +#endif #define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET) |
