Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1736a56f authored by Vineet Gupta's avatar Vineet Gupta
Browse files

ARC: rename kconfig option for unaligned emulation 



Signed-off-by: default avatarVineet Gupta <vgupta@synopsys.com>
parent 5c05483e

arch/arc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ config ARC_CURR_IN_REG 
	  kernel mode. This saves memory access for each such access





config ARC_MISALIGN_ACCESS

config ARC_EMUL_UNALIGNED

	bool "Emulate unaligned memory access (userspace only)"

	select SYSCTL_ARCH_UNALIGN_NO_WARN

	select SYSCTL_ARCH_UNALIGN_ALLOW

arch/arc/include/asm/unaligned.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <asm-generic/unaligned.h>

#include <asm/ptrace.h>



#ifdef CONFIG_ARC_MISALIGN_ACCESS

#ifdef CONFIG_ARC_EMUL_UNALIGNED

int misaligned_fixup(unsigned long address, struct pt_regs *regs,

		     struct callee_regs *cregs);

#else

arch/arc/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ obj-$(CONFIG_MODULES) += arcksyms.o module.o 
obj-$(CONFIG_SMP) 			+= smp.o

obj-$(CONFIG_ARC_DW2_UNWIND)		+= unwind.o

obj-$(CONFIG_KPROBES)      		+= kprobes.o

obj-$(CONFIG_ARC_MISALIGN_ACCESS) 	+= unaligned.o

obj-$(CONFIG_ARC_EMUL_UNALIGNED) 	+= unaligned.o

obj-$(CONFIG_KGDB)			+= kgdb.o

obj-$(CONFIG_ARC_METAWARE_HLINK)	+= arc_hostlink.o

obj-$(CONFIG_PERF_EVENTS)		+= perf_event.o

arch/arc/kernel/disasm.c

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
#include <linux/uaccess.h>

#include <asm/disasm.h>



#if defined(CONFIG_KGDB) || defined(CONFIG_ARC_MISALIGN_ACCESS) || \

#if defined(CONFIG_KGDB) || defined(CONFIG_ARC_EMUL_UNALIGNED) || \

	defined(CONFIG_KPROBES)



/* disasm_instr: Analyses instruction at addr, stores
@@ -535,4 +535,4 @@ int __kprobes disasm_next_pc(unsigned long pc, struct pt_regs *regs, 
	return instr.is_branch;

}



#endif /* CONFIG_KGDB || CONFIG_ARC_MISALIGN_ACCESS || CONFIG_KPROBES */
 
#endif /* CONFIG_KGDB || CONFIG_ARC_EMUL_UNALIGNED || CONFIG_KPROBES */