diff options
| -rw-r--r-- | arch/mips/kernel/asm-offsets.c | 3 | ||||
| -rw-r--r-- | arch/mips/kernel/vmlinux.lds.S | 15 | ||||
| -rw-r--r-- | arch/mips/power/hibernate.S | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/arch/mips/kernel/asm-offsets.c b/arch/mips/kernel/asm-offsets.c index 8d006ec6567..2c1e1d02338 100644 --- a/arch/mips/kernel/asm-offsets.c +++ b/arch/mips/kernel/asm-offsets.c @@ -183,9 +183,6 @@ void output_mm_defines(void) OFFSET(MM_PGD, mm_struct, pgd); OFFSET(MM_CONTEXT, mm_struct, context); BLANK(); - DEFINE(_PAGE_SIZE, PAGE_SIZE); - DEFINE(_PAGE_SHIFT, PAGE_SHIFT); - BLANK(); DEFINE(_PGD_T_SIZE, sizeof(pgd_t)); DEFINE(_PMD_T_SIZE, sizeof(pmd_t)); DEFINE(_PTE_T_SIZE, sizeof(pte_t)); diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index 1474c18fb77..ae8c1976df5 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S @@ -1,4 +1,5 @@ #include <asm/asm-offsets.h> +#include <asm/page.h> #include <asm-generic/vmlinux.lds.h> #undef mips @@ -76,7 +77,7 @@ SECTIONS * of ‘init_thread_union’ is greater than maximum * object file alignment. Using 32768 */ - . = ALIGN(_PAGE_SIZE); + . = ALIGN(PAGE_SIZE); *(.data.init_task) DATA_DATA @@ -96,12 +97,12 @@ SECTIONS *(.sdata) } - . = ALIGN(_PAGE_SIZE); + . = ALIGN(PAGE_SIZE); .data_nosave : { __nosave_begin = .; *(.data.nosave) } - . = ALIGN(_PAGE_SIZE); + . = ALIGN(PAGE_SIZE); __nosave_end = .; . = ALIGN(1 << CONFIG_MIPS_L1_CACHE_SHIFT); @@ -111,7 +112,7 @@ SECTIONS _edata = .; /* End of data section */ /* will be freed after init */ - . = ALIGN(_PAGE_SIZE); /* Init code and data */ + . = ALIGN(PAGE_SIZE); /* Init code and data */ __init_begin = .; .init.text : { _sinittext = .; @@ -151,15 +152,15 @@ SECTIONS EXIT_DATA } #if defined(CONFIG_BLK_DEV_INITRD) - . = ALIGN(_PAGE_SIZE); + . = ALIGN(PAGE_SIZE); .init.ramfs : { __initramfs_start = .; *(.init.ramfs) __initramfs_end = .; } #endif - PERCPU(_PAGE_SIZE) - . = ALIGN(_PAGE_SIZE); + PERCPU(PAGE_SIZE) + . = ALIGN(PAGE_SIZE); __init_end = .; /* freed after init ends here */ diff --git a/arch/mips/power/hibernate.S b/arch/mips/power/hibernate.S index 4b8174b382d..0cf86fb32ec 100644 --- a/arch/mips/power/hibernate.S +++ b/arch/mips/power/hibernate.S @@ -8,6 +8,7 @@ * Wu Zhangjin <wuzj@lemote.com> */ #include <asm/asm-offsets.h> +#include <asm/page.h> #include <asm/regdef.h> #include <asm/asm.h> @@ -34,7 +35,7 @@ LEAF(swsusp_arch_resume) 0: PTR_L t1, PBE_ADDRESS(t0) /* source */ PTR_L t2, PBE_ORIG_ADDRESS(t0) /* destination */ - PTR_ADDIU t3, t1, _PAGE_SIZE + PTR_ADDIU t3, t1, PAGE_SIZE 1: REG_L t8, (t1) REG_S t8, (t2) |