diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2012-08-28 09:42:27 -0700 |
---|---|---|
committer | Catalin Marinas <catalin.marinas@arm.com> | 2012-09-04 22:41:01 +0100 |
commit | b211d9def825e468e75b62f6c8a73cd3d3fb9c9b (patch) | |
tree | 3602418a932773fcc1c2c28d2dde453e8a6f2f75 | |
parent | 527164ea683492d9562a3226d2db64ec10b50e78 (diff) | |
download | linux-aarch64-b211d9def825e468e75b62f6c8a73cd3d3fb9c9b.tar.gz |
arm64: Remove CONFIG_AARCH32_EMULATION Kconfig option
CONFIG_COMPAT is enough, there is no need to define another Kconfig
option.
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Reported-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm64/configs/defconfig | 2 | ||||
-rw-r--r-- | arch/arm64/include/asm/elf.h | 6 | ||||
-rw-r--r-- | arch/arm64/include/asm/fpsimd.h | 2 | ||||
-rw-r--r-- | arch/arm64/include/asm/memory.h | 4 | ||||
-rw-r--r-- | arch/arm64/include/asm/processor.h | 6 | ||||
-rw-r--r-- | arch/arm64/include/asm/ptrace.h | 2 | ||||
-rw-r--r-- | arch/arm64/include/asm/signal32.h | 4 | ||||
-rw-r--r-- | arch/arm64/include/asm/stat.h | 2 | ||||
-rw-r--r-- | arch/arm64/include/asm/unistd.h | 2 | ||||
-rw-r--r-- | arch/arm64/kernel/Makefile | 2 | ||||
-rw-r--r-- | arch/arm64/kernel/asm-offsets.c | 2 | ||||
-rw-r--r-- | arch/arm64/kernel/entry.S | 6 | ||||
-rw-r--r-- | arch/arm64/kernel/head.S | 2 | ||||
-rw-r--r-- | arch/arm64/kernel/ptrace.c | 10 | ||||
-rw-r--r-- | arch/arm64/kernel/traps.c | 4 | ||||
-rw-r--r-- | arch/arm64/kernel/vdso.c | 6 | ||||
-rw-r--r-- | arch/arm64/mm/init.c | 2 |
17 files changed, 32 insertions, 32 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index d9aac95e127..9212c7880da 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -27,7 +27,7 @@ CONFIG_SMP=y CONFIG_PREEMPT_VOLUNTARY=y CONFIG_CMDLINE="console=ttyAMA0" # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set -CONFIG_AARCH32_EMULATION=y +CONFIG_COMPAT=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h index cb4984ba61e..cf284649dfc 100644 --- a/arch/arm64/include/asm/elf.h +++ b/arch/arm64/include/asm/elf.h @@ -138,7 +138,7 @@ extern int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp); /* 1GB of VA */ -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT #define STACK_RND_MASK (test_thread_flag(TIF_32BIT) ? \ 0x7ff >> (PAGE_SHIFT - 12) : \ 0x3ffff >> (PAGE_SHIFT - 12)) @@ -150,7 +150,7 @@ struct mm_struct; extern unsigned long arch_randomize_brk(struct mm_struct *mm); #define arch_randomize_brk arch_randomize_brk -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT #define EM_ARM 40 #define COMPAT_ELF_PLATFORM ("v8l") @@ -174,6 +174,6 @@ extern int aarch32_setup_vectors_page(struct linux_binprm *bprm, #define compat_arch_setup_additional_pages \ aarch32_setup_vectors_page -#endif /* CONFIG_AARCH32_EMULATION */ +#endif /* CONFIG_COMPAT */ #endif diff --git a/arch/arm64/include/asm/fpsimd.h b/arch/arm64/include/asm/fpsimd.h index 7ea4711a2fe..b42fab9f62a 100644 --- a/arch/arm64/include/asm/fpsimd.h +++ b/arch/arm64/include/asm/fpsimd.h @@ -40,7 +40,7 @@ struct fpsimd_state { }; }; -#if defined(__KERNEL__) && defined(CONFIG_AARCH32_EMULATION) +#if defined(__KERNEL__) && defined(CONFIG_COMPAT) /* Masks for extracting the FPSR and FPCR from the FPSCR */ #define VFP_FPSCR_STAT_MASK 0xf800009f #define VFP_FPSCR_CTRL_MASK 0x07f79f00 diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index 3cfdc4b5674..1cac16a001c 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -46,13 +46,13 @@ #define VA_BITS (39) #define TASK_SIZE_64 (UL(1) << VA_BITS) -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT #define TASK_SIZE_32 UL(0x100000000) #define TASK_SIZE (test_thread_flag(TIF_32BIT) ? \ TASK_SIZE_32 : TASK_SIZE_64) #else #define TASK_SIZE TASK_SIZE_64 -#endif /* CONFIG_AARCH32_EMULATION */ +#endif /* CONFIG_COMPAT */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 4)) diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index ebf2b22af5b..4a6f73cb93f 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h @@ -36,13 +36,13 @@ #ifdef __KERNEL__ #define STACK_TOP_MAX TASK_SIZE_64 -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT #define AARCH32_VECTORS_BASE 0xffff0000 #define STACK_TOP (test_thread_flag(TIF_32BIT) ? \ AARCH32_VECTORS_BASE : STACK_TOP_MAX) #else #define STACK_TOP STACK_TOP_MAX -#endif /* CONFIG_AARCH32_EMULATION */ +#endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */ struct debug_info { @@ -101,7 +101,7 @@ static inline void start_thread(struct pt_regs *regs, unsigned long pc, regs->regs[0] = stack[0]; /* x0 (argc) */ } -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT static inline void compat_start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp) { diff --git a/arch/arm64/include/asm/ptrace.h b/arch/arm64/include/asm/ptrace.h index 80fb42bf77b..f4e63d46620 100644 --- a/arch/arm64/include/asm/ptrace.h +++ b/arch/arm64/include/asm/ptrace.h @@ -131,7 +131,7 @@ struct pt_regs { #define arch_has_single_step() (1) -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT #define compat_thumb_mode(regs) \ (((regs)->pstate & COMPAT_PSR_T_BIT)) #else diff --git a/arch/arm64/include/asm/signal32.h b/arch/arm64/include/asm/signal32.h index 822b02fba4c..7c275e3b640 100644 --- a/arch/arm64/include/asm/signal32.h +++ b/arch/arm64/include/asm/signal32.h @@ -17,7 +17,7 @@ #define __ASM_SIGNAL32_H #ifdef __KERNEL__ -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT #include <linux/compat.h> #define AARCH32_KERN_SIGRET_CODE_OFFSET 0x500 @@ -48,6 +48,6 @@ static inline int compat_setup_rt_frame(int usig, struct k_sigaction *ka, static inline void compat_setup_restart_syscall(struct pt_regs *regs) { } -#endif /* CONFIG_AARCH32_EMULATION */ +#endif /* CONFIG_COMPAT */ #endif /* __KERNEL__ */ #endif /* __ASM_SIGNAL32_H */ diff --git a/arch/arm64/include/asm/stat.h b/arch/arm64/include/asm/stat.h index 5b734656837..d87225cbead 100644 --- a/arch/arm64/include/asm/stat.h +++ b/arch/arm64/include/asm/stat.h @@ -18,7 +18,7 @@ #include <asm-generic/stat.h> -#if defined(__KERNEL__) && defined(CONFIG_AARCH32_EMULATION) +#if defined(__KERNEL__) && defined(CONFIG_COMPAT) #include <asm/compat.h> diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index b00718ce97e..fe18a683274 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -20,7 +20,7 @@ #include <asm-generic/unistd.h> #endif -#if defined(__KERNEL__) && defined(CONFIG_AARCH32_EMULATION) +#if defined(__KERNEL__) && defined(CONFIG_COMPAT) #include <asm/unistd32.h> #endif diff --git a/arch/arm64/kernel/Makefile b/arch/arm64/kernel/Makefile index cb0df37f1e2..e2caff1b812 100644 --- a/arch/arm64/kernel/Makefile +++ b/arch/arm64/kernel/Makefile @@ -10,7 +10,7 @@ arm64-obj-y := cputable.o debug-monitors.o entry.o irq.o fpsimd.o \ entry-fpsimd.o process.o ptrace.o setup.o signal.o \ sys.o stacktrace.o time.o traps.o io.o vdso.o -arm64-obj-$(CONFIG_AARCH32_EMULATION) += sys32.o kuser32.o signal32.o \ +arm64-obj-$(CONFIG_COMPAT) += sys32.o kuser32.o signal32.o \ sys_compat.o arm64-obj-$(CONFIG_MODULES) += arm64ksyms.o module.o arm64-obj-$(CONFIG_SMP) += smp.o diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c index 1a94fca2c28..a2a4d810bea 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c @@ -50,7 +50,7 @@ int main(void) DEFINE(S_X7, offsetof(struct pt_regs, regs[7])); DEFINE(S_LR, offsetof(struct pt_regs, regs[30])); DEFINE(S_SP, offsetof(struct pt_regs, sp)); -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT DEFINE(S_COMPAT_SP, offsetof(struct pt_regs, compat_sp)); #endif DEFINE(S_PSTATE, offsetof(struct pt_regs, pstate)); diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 5fe5185f9fa..ed2e58fbd2f 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -169,7 +169,7 @@ ENTRY(vectors) ventry el0_fiq_invalid // FIQ 64-bit EL0 ventry el0_error_invalid // Error 64-bit EL0 -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT ventry el0_sync_compat // Synchronous 32-bit EL0 ventry el0_irq_compat // IRQ 32-bit EL0 ventry el0_fiq_invalid_compat // FIQ 32-bit EL0 @@ -209,7 +209,7 @@ el0_error_invalid: inv_entry 0, BAD_ERROR ENDPROC(el0_error_invalid) -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT el0_fiq_invalid_compat: inv_entry 0, BAD_FIQ, 32 ENDPROC(el0_fiq_invalid_compat) @@ -373,7 +373,7 @@ el0_sync: b.ge el0_dbg b el0_inv -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT .align 6 el0_sync_compat: kernel_entry 0, 32 diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index d6683fa32f5..b158f17f787 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -174,7 +174,7 @@ ENTRY(el2_setup) mov x0, #0x33ff msr cptr_el2, x0 // Disable copro. traps to EL2 -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT msr hstr_el2, xzr // Disable CP15 traps to EL2 #endif diff --git a/arch/arm64/kernel/ptrace.c b/arch/arm64/kernel/ptrace.c index f45004797eb..0d8453a64cc 100644 --- a/arch/arm64/kernel/ptrace.c +++ b/arch/arm64/kernel/ptrace.c @@ -377,7 +377,7 @@ static const struct user_regset_view user_aarch64_view = { .regsets = aarch64_regsets, .n = ARRAY_SIZE(aarch64_regsets) }; -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT enum compat_regset { REGSET_COMPAT_GPR, REGSET_COMPAT_VFP, @@ -560,11 +560,11 @@ static const struct user_regset_view user_aarch32_view = { .name = "aarch32", .e_machine = EM_ARM, .regsets = aarch32_regsets, .n = ARRAY_SIZE(aarch32_regsets) }; -#endif /* CONFIG_AARCH32_EMULATION */ +#endif /* CONFIG_COMPAT */ const struct user_regset_view *task_user_regset_view(struct task_struct *task) { -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT if (is_compat_thread(task_thread_info(task))) return &user_aarch32_view; #endif @@ -600,7 +600,7 @@ long arch_ptrace(struct task_struct *child, long request, return ret; } -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT #include <linux/compat.h> @@ -789,7 +789,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, return ret; } -#endif /* CONFIG_AARCH32_EMULATION */ +#endif /* CONFIG_COMPAT */ static int __init ptrace_break_init(void) { diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index dc8cae36cfd..3883f842434 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -268,7 +268,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) siginfo_t info; void __user *pc = (void __user *)instruction_pointer(regs); -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT /* check for AArch32 breakpoint instructions */ if (compat_user_mode(regs) && aarch32_break_trap(regs) == 0) return; @@ -292,7 +292,7 @@ long compat_arm_syscall(struct pt_regs *regs); asmlinkage long do_ni_syscall(struct pt_regs *regs) { -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT long ret; if (is_compat_task()) { ret = compat_arm_syscall(regs); diff --git a/arch/arm64/kernel/vdso.c b/arch/arm64/kernel/vdso.c index 8d8a3659f3f..17948fc7d66 100644 --- a/arch/arm64/kernel/vdso.c +++ b/arch/arm64/kernel/vdso.c @@ -48,7 +48,7 @@ static union { } vdso_data_store __page_aligned_data; struct vdso_data *vdso_data = &vdso_data_store.data; -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT /* * Create and map the vectors page for AArch32 tasks. */ @@ -98,7 +98,7 @@ int aarch32_setup_vectors_page(struct linux_binprm *bprm, int uses_interp) return ret; } -#endif /* CONFIG_AARCH32_EMULATION */ +#endif /* CONFIG_COMPAT */ static int __init vdso_init(void) { @@ -190,7 +190,7 @@ const char *arch_vma_name(struct vm_area_struct *vma) * it conflicting with the vectors base. */ if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) { -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT if (vma->vm_start == AARCH32_VECTORS_BASE) return "[vectors]"; #endif diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index c87583d3f98..31428cadcf1 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -368,7 +368,7 @@ void __init mem_init(void) * Check boundaries twice: Some fundamental inconsistencies can be * detected at build time already. */ -#ifdef CONFIG_AARCH32_EMULATION +#ifdef CONFIG_COMPAT BUILD_BUG_ON(TASK_SIZE_32 > TASK_SIZE_64); #endif BUILD_BUG_ON(TASK_SIZE_64 > MODULES_VADDR); |