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

Commit 0a858409 authored by Srinivasarao P's avatar Srinivasarao P
Browse files

Merge android-4.4.165 (f34ff9e8) into msm-4.4 



* refs/heads/tmp-f34ff9e8
  Linux 4.4.165
  xhci: Fix USB3 NULL pointer dereference at logical disconnect.
  HID: uhid: forbid UHID_CREATE under KERNEL_DS or elevated privileges
  new helper: uaccess_kernel()
  ACPI / platform: Add SMB0001 HID to forbidden_id_list
  drivers/misc/sgi-gru: fix Spectre v1 vulnerability
  USB: misc: appledisplay: add 20" Apple Cinema Display
  misc: atmel-ssc: Fix section annotation on atmel_ssc_get_driver_data
  usb: quirks: Add delay-init quirk for Corsair K70 LUX RGB
  USB: quirks: Add no-lpm quirk for Raydium touchscreens
  usb: cdc-acm: add entry for Hiro (Conexant) modem
  uio: Fix an Oops on load
  media: v4l: event: Add subscription to list before calling "add" operation
  Revert "Bluetooth: h5: Fix missing dependency on BT_HCIUART_SERDEV"
  Revert "media: videobuf2-core: don't call memop 'finish' when queueing"
  btrfs: fix pinned underflow after transaction aborted
  gfs2: Put bitmap buffers in put_super
  SUNRPC: drop pointless static qualifier in xdr_get_next_encode_buffer()
  zram: close udev startup race condition as default groups
  lib/raid6: Fix arm64 test build
  hwmon: (ibmpowernv) Remove bogus __init annotations
  netfilter: xt_IDLETIMER: add sysfs filename checking routine
  netfilter: ipset: Correct rcu_dereference() call in ip_set_put_comment()
  s390/mm: Fix ERROR: "__node_distance" undefined!
  netfilter: ipset: actually allow allowable CIDR 0 in hash:net,port,net
  s390/vdso: add missing FORCE to build targets
  arm64: percpu: Initialize ret in the default case
  platform/x86: acerhdf: Add BIOS entry for Gateway LT31 v1.3307
  clk: samsung: exynos5420: Enable PERIS clocks for suspend
  fs/exofs: fix potential memory leak in mount option parsing
  um: Give start_idle_thread() a return code
  hfsplus: prevent btree data loss on root split
  hfs: prevent btree data loss on root split
  reiserfs: propagate errors from fill_with_dentries() properly
  x86/build: Use cc-option to validate stack alignment parameter
  x86/build: Fix stack alignment for CLang
  x86/boot: #undef memcpy() et al in string.c
  x86/build: Specify stack alignment for clang
  x86/build: Use __cc-option for boot code compiler options
  kbuild: Add __cc-option macro
  x86/mm/kaslr: Use the _ASM_MUL macro for multiplication to work around Clang incompatibility
  crypto, x86: aesni - fix token pasting for clang
  x86/kbuild: Use cc-option to enable -falign-{jumps/loops}
  arm64: Disable asm-operand-width warning for clang
  kbuild: allow to use GCC toolchain not in Clang search path
  kbuild: set no-integrated-as before incl. arch Makefile
  kbuild: clang: disable unused variable warnings only when constant
  kbuild: clang: remove crufty HOSTCFLAGS
  kbuild: clang: fix build failures with sparse check
  kbuild: move cc-option and cc-disable-warning after incl. arch Makefile
  kbuild: Set KBUILD_CFLAGS before incl. arch Makefile
  kbuild: fix linker feature test macros when cross compiling with Clang
  efi/libstub/arm64: Set -fpie when building the EFI stub
  efi/libstub/arm64: Force 'hidden' visibility for section markers
  crypto: arm64/sha - avoid non-standard inline asm tricks
  kbuild: clang: Disable 'address-of-packed-member' warning
  modules: mark __inittest/__exittest as __maybe_unused
  kbuild: Add support to generate LLVM assembly files
  kbuild: use -Oz instead of -Os when using clang
  kbuild, LLVMLinux: Add -Werror to cc-option to support clang
  kbuild: drop -Wno-unknown-warning-option from clang options
  kbuild: fix asm-offset generation to work with clang
  kbuild: consolidate redundant sed script ASM offset generation
  kbuild: Consolidate header generation from ASM offset information
  kbuild: clang: add -no-integrated-as to KBUILD_[AC]FLAGS
  kbuild: Add better clang cross build support
  ipv6: Fix PMTU updates for UDP/raw sockets in presence of VRF
  tg3: Add PHY reset for 5717/5719/5720 in change ring and flow control paths
  net-gro: reset skb->pkt_type in napi_reuse_skb()
  ip_tunnel: don't force DF when MTU is locked
  flow_dissector: do not dissect l4 ports for fragments

Conflicts:
	arch/um/os-Linux/skas/process.c

Change-Id: I6587d94332e204c068f7d44428a2ec1280bc3a7f
Signed-off-by: default avatarSrinivasarao P <spathi@codeaurora.org>
parents f96a0433 f34ff9e8

Makefile

+19 −8
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 164

SUBLEVEL = 165

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -306,11 +306,6 @@ HOSTCXX = g++ 
HOSTCFLAGS   := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89

HOSTCXXFLAGS = -O2



ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)

HOSTCFLAGS  += -Wno-unused-value -Wno-unused-parameter \

		-Wno-missing-field-initializers -fno-delete-null-pointer-checks

endif



# Decide whether to build built-in, modular, or both.

# Normally, just do built-in.
@@ -620,6 +615,22 @@ endif # $(dot-config) 
# Defaults to vmlinux, but the arch makefile usually adds further targets

all: vmlinux



ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TARGET	:= --target=$(notdir $(CROSS_COMPILE:%-=%))

GCC_TOOLCHAIN_DIR := $(dir $(shell which $(LD)))

CLANG_PREFIX	:= --prefix=$(GCC_TOOLCHAIN_DIR)

GCC_TOOLCHAIN	:= $(realpath $(GCC_TOOLCHAIN_DIR)/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= --gcc-toolchain=$(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC) $(CLANG_PREFIX)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

endif



# The arch Makefile can set ARCH_{CPP,A,C}FLAGS to override the default

# values of the respective KBUILD_* variables

ARCH_CPPFLAGS :=
@@ -742,11 +753,11 @@ KBUILD_AFLAGS += $(call cc-option, -no-integrated-as) 
else



# These warnings generated too much noise in a regular build.

# Use make W=1 to enable them (see scripts/Makefile.build)

# Use make W=1 to enable them (see scripts/Makefile.extrawarn)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-but-set-variable)

KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

endif



KBUILD_CFLAGS += $(call cc-disable-warning, unused-const-variable)

ifdef CONFIG_FRAME_POINTER

KBUILD_CFLAGS	+= -fno-omit-frame-pointer -fno-optimize-sibling-calls

else

arch/arm64/include/asm/percpu.h

+3 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ static inline unsigned long __percpu_##op(void *ptr, \ 
		: [val] "Ir" (val));					\

		break;							\

	default:							\

		ret = 0;						\

		BUILD_BUG();						\

	}								\

									\
@@ -115,6 +116,7 @@ static inline unsigned long __percpu_read(void *ptr, int size) 
		ret = ACCESS_ONCE(*(u64 *)ptr);

		break;

	default:

		ret = 0;

		BUILD_BUG();

	}
@@ -184,6 +186,7 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val, 
		: [val] "r" (val));

		break;

	default:

		ret = 0;

		BUILD_BUG();

	}

arch/s390/kernel/vdso32/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ GCOV_PROFILE := n 
$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32)

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32) FORCE

	$(call if_changed,vdso32ld)



# strip rule for the .so file
@@ -38,12 +38,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso32): %.o: %.S

$(obj-vdso32): %.o: %.S FORCE

	$(call if_changed_dep,vdso32as)



# actual build commands

quiet_cmd_vdso32ld = VDSO32L $@

      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $^ -o $@

      cmd_vdso32ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@

quiet_cmd_vdso32as = VDSO32A $@

      cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $<

arch/s390/kernel/vdso64/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ GCOV_PROFILE := n 
$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64)

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64) FORCE

	$(call if_changed,vdso64ld)



# strip rule for the .so file
@@ -38,12 +38,12 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE 
	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso64): %.o: %.S

$(obj-vdso64): %.o: %.S FORCE

	$(call if_changed_dep,vdso64as)



# actual build commands

quiet_cmd_vdso64ld = VDSO64L $@

      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $^ -o $@

      cmd_vdso64ld = $(CC) $(c_flags) -Wl,-T $(filter %.lds %.o,$^) -o $@

quiet_cmd_vdso64as = VDSO64A $@

      cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<

arch/s390/numa/numa.c

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ int __node_distance(int a, int b) 
{

	return mode->distance ? mode->distance(a, b) : 0;

}

EXPORT_SYMBOL(__node_distance);



int numa_debug_enabled;