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

Commit ba855159 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.18.94 into android-3.18 



Changes in 3.18.94
	Input: do not emit unneeded EV_SYN when suspending
	um: link vmlinux with -no-pie
	um: Stop abusing __KERNEL__
	um: Remove copy&paste code from init.h
	loop: fix concurrent lo_open/lo_release
	ALSA: seq: Make ioctls race-free
	gpio: iop: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
	igb: Free IRQs when device is hotplugged
	KVM: x86: emulator: Return to user-mode on L1 CPL=0 emulation failure
	KVM: x86: Don't re-execute instruction when not passing CR2 value
	KVM: X86: Fix operand/address-size during instruction decoding
	bcache: check return value of register_shrinker
	mac80211: fix the update of path metric for RANN frame
	KVM: VMX: Fix rflags cache during vCPU reset
	xen-netfront: remove warning when unloading module
	nfsd: CLOSE SHOULD return the invalid special stateid for NFSv4.x (x>0)
	nfsd: check for use of the closed special stateid
	hwmon: (pmbus) Use 64bit math for DIRECT format values
	net: ethernet: xilinx: Mark XILINX_LL_TEMAC broken on 64-bit
	quota: Check for register_shrinker() failure.
	scsi: ufs: ufshcd: fix potential NULL pointer dereference in ufshcd_config_vreg
	media: usbtv: add a new usbid
	usb: gadget: don't dereference g until after it has been null checked
	staging: rtl8188eu: Fix incorrect response to SIOCGIWESSID
	USB: serial: pl2303: new device id for Chilitag
	USB: cdc-acm: Do not log urb submission errors on disconnect
	CDC-ACM: apply quirk for card reader
	USB: serial: io_edgeport: fix possible sleep-in-atomic
	usbip: prevent bind loops on devices attached to vhci_hcd
	usbip: list: don't list devices attached to vhci_hcd
	USB: serial: simple: add Motorola Tetra driver
	usb: f_fs: Prevent gadget unbind if it is already unbound
	usb: uas: unconditionally bring back host after reset
	selinux: general protection fault in sock_has_perm
	spi: imx: do not access registers while clocks disabled
	ASoC: pcm512x: add missing MODULE_DESCRIPTION/AUTHOR/LICENSE
	um: Fix out-of-tree build
	Linux 3.18.94

Change-Id: I3c9537e851b37b33cb6aa50f66ef245ce552c46d
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 22c24eea cde3537b

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 93

SUBLEVEL = 94

EXTRAVERSION =

NAME = Diseased Newt

arch/um/Makefile

+5 −4
Original line number Diff line number Diff line
@@ -68,9 +68,10 @@ KBUILD_CFLAGS += $(CFLAGS) $(CFLAGS-y) -D__arch_um__ \ 


KBUILD_AFLAGS += $(ARCH_INCLUDE)



USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\

	$(patsubst -I%,,$(KBUILD_CFLAGS)))) $(ARCH_INCLUDE) $(MODE_INCLUDE) \

	$(filter -I%,$(CFLAGS)) -D_FILE_OFFSET_BITS=64 -idirafter include

USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -I%,,$(KBUILD_CFLAGS))) \

		$(ARCH_INCLUDE) $(MODE_INCLUDE) $(filter -I%,$(CFLAGS)) \

		-D_FILE_OFFSET_BITS=64 -idirafter $(srctree)/include \

		-idirafter $(obj)/include -D__KERNEL__ -D__UM_HOST__



#This will adjust *FLAGS accordingly to the platform.

include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
@@ -116,7 +117,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/drivers/mconsole.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#ifndef __MCONSOLE_H__

#define __MCONSOLE_H__



#ifndef __KERNEL__

#ifdef __UM_HOST__

#include <stdint.h>

#define u32 uint32_t

#endif

arch/um/include/shared/init.h

+2 −22
Original line number Diff line number Diff line
@@ -40,28 +40,8 @@ 
typedef int (*initcall_t)(void);

typedef void (*exitcall_t)(void);



#ifndef __KERNEL__

#ifndef __section

# define __section(S) __attribute__ ((__section__(#S)))

#endif



#if __GNUC__ == 3



#if __GNUC_MINOR__ >= 3

# define __used			__attribute__((__used__))

#else

# define __used			__attribute__((__unused__))

#endif



#else

#if __GNUC__ == 4

# define __used			__attribute__((__used__))

#endif

#endif



#else

#include <linux/compiler.h>

#endif



/* These are for everybody (although not all archs will actually

   discard it in modules) */

#define __init		__section(.init.text)
@@ -131,7 +111,7 @@ extern struct uml_param __uml_setup_start, __uml_setup_end; 
#define __uml_postsetup_call	__used __section(.uml.postsetup.init)

#define __uml_exit_call		__used __section(.uml.exitcall.exit)



#ifndef __KERNEL__

#ifdef __UM_HOST__



#define __define_initcall(level,fn) \

	static initcall_t __initcall_##fn __used \

arch/um/include/shared/user.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))



/* This is to get size_t */

#ifdef __KERNEL__

#ifndef __UM_HOST__

#include <linux/types.h>

#else

#include <stddef.h>