Commit 2896b80e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML updates from Richard Weinberger:

 - minor improvements

 - fixes for Debian's new gcc defaults (pie enabled by default)

 - fixes for XSTATE/XSAVE to make UML work again on modern systems

* 'for-linus-4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: return negative in tuntap_open_tramp()
  um: remove a stray tab
  um: Use relative modversions with LD_SCRIPT_DYN
  um: link vmlinux with -no-pie
  um: Fix CONFIG_GCOV for modules.
  Fix minor typos and grammar in UML start_up help
  um: defconfig: Cleanup from old Kconfig options
  um: Fix FP register size for XSTATE/XSAVE
parents 48bddb14 6d20e6b2

arch/um/Kconfig.um

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ config LD_SCRIPT_DYN 
	bool

	default y

	depends on !LD_SCRIPT_STATIC

        select MODULE_REL_CRCS if MODVERSIONS



source "fs/Kconfig.binfmt"

arch/um/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ archheaders: 
archprepare: include/generated/user_constants.h



LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static

LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib

LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib $(call cc-option, -no-pie)



CFLAGS_NO_HARDENING := $(call cc-option, -fno-PIC,) $(call cc-option, -fno-pic,) \

	$(call cc-option, -fno-stack-protector,) \

arch/um/configs/i386_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -53,7 +53,6 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UML_NET=y

CONFIG_UML_NET_ETHERTAP=y

arch/um/configs/x86_64_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ CONFIG_NET=y 
CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y

# CONFIG_INET_LRO is not set

# CONFIG_IPV6 is not set

CONFIG_UML_NET=y

CONFIG_UML_NET_ETHERTAP=y

arch/um/include/asm/thread_info.h

+3 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <asm/types.h>

#include <asm/page.h>

#include <asm/segment.h>

#include <sysdep/ptrace_user.h>



struct thread_info {

	struct task_struct	*task;		/* main task structure */
@@ -22,6 +23,8 @@ struct thread_info { 
					 	   0-0xBFFFFFFF for user

						   0-0xFFFFFFFF for kernel */

	struct thread_info	*real_thread;    /* Points to non-IRQ stack */

	unsigned long aux_fp_regs[FP_SIZE];	/* auxiliary fp_regs to save/restore

						   them out-of-band */

};



#define INIT_THREAD_INFO(tsk)			\

CRA Git | Maintained and supported by SUSTech CRA and CCSE