Merge branch 'arch-unicore32' into no-rebases (1e93f668) · Commits · e / devices / android_kernel_xiaomi_markw

arch/unicore32/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@ config UNICORE32
		select ARCH_WANT_FRAME_POINTERS
		select GENERIC_IOMAP
		select MODULES_USE_ELF_REL
		select GENERIC_KERNEL_THREAD
		select GENERIC_KERNEL_EXECVE
		help
		UniCore-32 is 32-bit Instruction Set Architecture,
		including a series of low-power-consumption RISC chip
		@@ -64,6 +66,9 @@ config GENERIC_CALIBRATE_DELAY
		config ARCH_MAY_HAVE_PC_FDC
		bool

		config ZONE_DMA
		def_bool y

		config NEED_DMA_MAP_STATE
		def_bool y

+0 −1

Original line number	Diff line number	Diff line
		include include/asm-generic/Kbuild.asm

		generic-y += atomic.h
		generic-y += auxvec.h

+0 −5

Original line number	Diff line number	Diff line
		@@ -19,9 +19,4 @@ extern void die(const char msg, struct pt_regs regs, int err);
		extern void uc32_notify_die(const char str, struct pt_regs regs,
		struct siginfo *info, unsigned long err, unsigned long trap);

		extern asmlinkage void __backtrace(void);
		extern asmlinkage void c_backtrace(unsigned long fp, int pmode);

		extern void __show_regs(struct pt_regs *);

		#endif /* __UNICORE_BUG_H__ */

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
		: "memory", "cc");
		break;
		default:
		ret = __xchg_bad_pointer();
		__xchg_bad_pointer();
		}

		return ret;

deleted100644 → 0

+0 −1

Original line number	Diff line number	Diff line
		#include <asm-generic/kvm_para.h>