diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /include/asm-mips/fixmap.h | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'include/asm-mips/fixmap.h')
| -rw-r--r-- | include/asm-mips/fixmap.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-mips/fixmap.h b/include/asm-mips/fixmap.h index 1cadefbbc037..6959bdb59310 100644 --- a/include/asm-mips/fixmap.h +++ b/include/asm-mips/fixmap.h | |||
| @@ -69,7 +69,11 @@ extern void __set_fixmap (enum fixed_addresses idx, | |||
| 69 | * the start of the fixmap, and leave one page empty | 69 | * the start of the fixmap, and leave one page empty |
| 70 | * at the top of mem.. | 70 | * at the top of mem.. |
| 71 | */ | 71 | */ |
| 72 | #if defined(CONFIG_CPU_TX39XX) || defined(CONFIG_CPU_TX49XX) | ||
| 73 | #define FIXADDR_TOP (0xff000000UL - 0x2000) | ||
| 74 | #else | ||
| 72 | #define FIXADDR_TOP (0xffffe000UL) | 75 | #define FIXADDR_TOP (0xffffe000UL) |
| 76 | #endif | ||
| 73 | #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) | 77 | #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT) |
| 74 | #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) | 78 | #define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE) |
| 75 | 79 | ||