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

Unverified Commit dceb669f authored by derfelot's avatar derfelot
Browse files

Merge Linux 4.4.257 kernel 

Changes in 4.4.257: (39 commits)
        net_sched: reject silly cell_log in qdisc_get_rtab()
        futex,rt_mutex: Provide futex specific rt_mutex API
        futex: Remove rt_mutex_deadlock_account_*()
        futex: Rework inconsistent rt_mutex/futex_q state
        futex: Avoid violating the 10th rule of futex
        futex: Replace pointless printk in fixup_owner()
        futex: Provide and use pi_state_update_owner()
        rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
        futex: Use pi_state_update_owner() in put_pi_state()
        futex: Simplify fixup_pi_state_owner()
        futex: Handle faults correctly for PI futexes
        usb: udc: core: Use lock when write to soft_connect
        scsi: libfc: Avoid invoking response handler twice if ep is already completed
        scsi: ibmvfc: Set default timeout to avoid crash during migration
        stable: clamp SUBLEVEL in 4.4 and 4.9
        USB: serial: cp210x: add pid/vid for WSDA-200-USB
        USB: serial: cp210x: add new VID/PID for supporting Teraoka AD2000
        USB: serial: option: Adding support for Cinterion MV31
        Input: i8042 - unbreak Pegatron C15B
        net: lapb: Copy the skb before sending a packet
        ELF/MIPS build fix
        elfcore: fix building with clang
        USB: gadget: legacy: fix an error code in eth_bind()
        USB: usblp: don't call usb_set_interface if there's a single alt
        usb: dwc2: Fix endpoint direction check in ep_from_windex
        mac80211: fix station rate table updates on assoc
        kretprobe: Avoid re-registration of the same kretprobe earlier
        cifs: report error instead of invalid when revalidating a dentry fails
        mmc: core: Limit retries when analyse of SDIO tuples fails
        ARM: footbridge: fix dc21285 PCI configuration accessors
        mm: hugetlbfs: fix cannot migrate the fallocated HugeTLB page
        mm: hugetlb: fix a race between isolating and freeing page
        mm: hugetlb: remove VM_BUG_ON_PAGE from page_huge_active
        x86/build: Disable CET instrumentation in the kernel
        x86/apic: Add extra serialization for non-serializing MSRs
        Input: xpad - sync supported devices with fork on GitHub
        ACPI: thermal: Do not call acpi_thermal_check() directly
        ALSA: hda/realtek - Fix typo of pincfg for Dell quirk
        Linux 4.4.257
parents cb8f02d3 788437ba

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 256

SUBLEVEL = 257

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -857,12 +857,6 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=strict-prototypes) 
# Prohibit date/time macros, which would make the build non-deterministic

KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)



# ensure -fcf-protection is disabled when using retpoline as it is

# incompatible with -mindirect-branch=thunk-extern

ifdef CONFIG_RETPOLINE

KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)

endif



# use the deterministic mode of AR if available

KBUILD_ARFLAGS := $(call ar-option,D)
@@ -1101,7 +1095,7 @@ endef 


define filechk_version.h

	(echo \#define LINUX_VERSION_CODE $(shell                         \

	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \

	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255); \

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)

endef

arch/arm/mach-footbridge/dc21285.c

+6 −6
Original line number Diff line number Diff line
@@ -69,15 +69,15 @@ dc21285_read_config(struct pci_bus *bus, unsigned int devfn, int where, 
	if (addr)

		switch (size) {

		case 1:

			asm("ldrb	%0, [%1, %2]"

			asm volatile("ldrb	%0, [%1, %2]"

				: "=r" (v) : "r" (addr), "r" (where) : "cc");

			break;

		case 2:

			asm("ldrh	%0, [%1, %2]"

			asm volatile("ldrh	%0, [%1, %2]"

				: "=r" (v) : "r" (addr), "r" (where) : "cc");

			break;

		case 4:

			asm("ldr	%0, [%1, %2]"

			asm volatile("ldr	%0, [%1, %2]"

				: "=r" (v) : "r" (addr), "r" (where) : "cc");

			break;

		}
@@ -103,17 +103,17 @@ dc21285_write_config(struct pci_bus *bus, unsigned int devfn, int where, 
	if (addr)

		switch (size) {

		case 1:

			asm("strb	%0, [%1, %2]"

			asm volatile("strb	%0, [%1, %2]"

				: : "r" (value), "r" (addr), "r" (where)

				: "cc");

			break;

		case 2:

			asm("strh	%0, [%1, %2]"

			asm volatile("strh	%0, [%1, %2]"

				: : "r" (value), "r" (addr), "r" (where)

				: "cc");

			break;

		case 4:

			asm("str	%0, [%1, %2]"

			asm volatile("str	%0, [%1, %2]"

				: : "r" (value), "r" (addr), "r" (where)

				: "cc");

			break;

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3049,6 +3049,7 @@ config MIPS32_N32 
config BINFMT_ELF32

	bool

	default y if MIPS32_O32 || MIPS32_N32

	select ELFCORE



endmenu

arch/x86/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -139,6 +139,9 @@ else 
        KBUILD_CFLAGS += -mno-red-zone

        KBUILD_CFLAGS += -mcmodel=kernel



	# Intel CET isn't enabled in the kernel

	KBUILD_CFLAGS += $(call cc-option,-fcf-protection=none)



        # -funit-at-a-time shrinks the kernel .text considerably

        # unfortunately it makes reading oopses harder.

        KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time)

arch/x86/include/asm/apic.h

+0 −10
Original line number Diff line number Diff line
@@ -168,16 +168,6 @@ static inline void disable_local_APIC(void) { } 
#endif /* !CONFIG_X86_LOCAL_APIC */



#ifdef CONFIG_X86_X2APIC

/*

 * Make previous memory operations globally visible before

 * sending the IPI through x2apic wrmsr. We need a serializing instruction or

 * mfence for this.

 */

static inline void x2apic_wrmsr_fence(void)

{

	asm volatile("mfence" : : : "memory");

}



static inline void native_apic_msr_write(u32 reg, u32 v)

{

	if (reg == APIC_DFR || reg == APIC_ID || reg == APIC_LDR ||