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

Commit c5e35d6c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://github.com/gxt/linux 

Pull unicore32 update from Guan Xuetao.

* tag 'for-linus' of git://github.com/gxt/linux:
  arch/unicore32: remove CONFIG_EXPERIMENTAL
  unicore32: switch to generic sys_execve()
  unicore32: switch to generic kernel_thread()/kernel_execve()
  unicore32: Use Kbuild infrastructure for kvm_para.h
  UAPI: (Scripted) Disintegrate arch/unicore32/include/asm
  UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler
  UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer
  UniCore32 bugfix: add missed CONFIG_ZONE_DMA
  unicore32/mm/fault.c: Port OOM changes to do_pf
parents ce95a36b c2844646

arch/unicore32/Kconfig

+6 −1
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
@@ -216,7 +221,7 @@ config PUV3_GPIO 
	bool

	depends on !ARCH_FPGA

	select GENERIC_GPIO

	select GPIO_SYSFS if EXPERIMENTAL

	select GPIO_SYSFS

	default y



if PUV3_NB0916

arch/unicore32/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
include include/asm-generic/Kbuild.asm



generic-y += atomic.h

generic-y += auxvec.h

arch/unicore32/include/asm/bug.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__ */

arch/unicore32/include/asm/cmpxchg.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;

arch/unicore32/include/asm/kvm_para.h

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
#include <asm-generic/kvm_para.h>