diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-09 00:17:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-09 00:17:25 +0200 |
commit | cdbb92b31d3c465aa96bd09f2d42c39b87b32bee (patch) | |
tree | 370e29681529882d7e4c766a19f0612885583464 /include/asm-mips/sn/mapped_kernel.h | |
parent | 2ec2b482b10a1ed3493c224f1893cddd3d33833b (diff) | |
parent | 69849375d6b13e94d08cdc94b49b11fbab454a0e (diff) |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'include/asm-mips/sn/mapped_kernel.h')
-rw-r--r-- | include/asm-mips/sn/mapped_kernel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-mips/sn/mapped_kernel.h b/include/asm-mips/sn/mapped_kernel.h index c3dd5d0d525f..721496a0bb92 100644 --- a/include/asm-mips/sn/mapped_kernel.h +++ b/include/asm-mips/sn/mapped_kernel.h @@ -5,6 +5,8 @@ #ifndef __ASM_SN_MAPPED_KERNEL_H #define __ASM_SN_MAPPED_KERNEL_H +#include <linux/mmzone.h> + /* * Note on how mapped kernels work: the text and data section is * compiled at cksseg segment (LOADADDR = 0xc001c000), and the @@ -29,10 +31,8 @@ #define MAPPED_ADDR_RO_TO_PHYS(x) (x - REP_BASE) #define MAPPED_ADDR_RW_TO_PHYS(x) (x - REP_BASE - 16777216) -#define MAPPED_KERN_RO_PHYSBASE(n) \ - (PLAT_NODE_DATA(n)->kern_vars.kv_ro_baseaddr) -#define MAPPED_KERN_RW_PHYSBASE(n) \ - (PLAT_NODE_DATA(n)->kern_vars.kv_rw_baseaddr) +#define MAPPED_KERN_RO_PHYSBASE(n) (hub_data(n)->kern_vars.kv_ro_baseaddr) +#define MAPPED_KERN_RW_PHYSBASE(n) (hub_data(n)->kern_vars.kv_rw_baseaddr) #define MAPPED_KERN_RO_TO_PHYS(x) \ ((unsigned long)MAPPED_ADDR_RO_TO_PHYS(x) | \ |