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

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

Merge 4.4.63 into android-4.4 



Changes in 4.4.63:
	cgroup, kthread: close race window where new kthreads can be migrated to non-root cgroups
	thp: fix MADV_DONTNEED vs clear soft dirty race
	drm/nouveau/mpeg: mthd returns true on success now
	drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one
	CIFS: store results of cifs_reopen_file to avoid infinite wait
	Input: xpad - add support for Razer Wildcat gamepad
	perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32()
	x86/vdso: Ensure vdso32_enabled gets set to valid values only
	x86/vdso: Plug race between mapping and ELF header setup
	acpi, nfit, libnvdimm: fix interleave set cookie calculation (64-bit comparison)
	iscsi-target: Fix TMR reference leak during session shutdown
	iscsi-target: Drop work-around for legacy GlobalSAN initiator
	scsi: sr: Sanity check returned mode data
	scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable
	scsi: sd: Fix capacity calculation with 32-bit sector_t
	xen, fbfront: fix connecting to backend
	libnvdimm: fix reconfig_mutex, mmap_sem, and jbd2_handle lockdep splat
	irqchip/irq-imx-gpcv2: Fix spinlock initialization
	ftrace: Fix removing of second function probe
	char: Drop bogus dependency of DEVPORT on !M68K
	char: lack of bool string made CONFIG_DEVPORT always on
	Revert "MIPS: Lantiq: Fix cascaded IRQ setup"
	kvm: fix page struct leak in handle_vmon
	zram: do not use copy_page with non-page aligned address
	powerpc: Disable HFSCR[TM] if TM is not supported
	crypto: ahash - Fix EINPROGRESS notification callback
	ath9k: fix NULL pointer dereference
	dvb-usb-v2: avoid use-after-free
	ext4: fix inode checksum calculation problem if i_extra_size is small
	platform/x86: acer-wmi: setup accelerometer when machine has appropriate notify event
	rtc: tegra: Implement clock handling
	mm: Tighten x86 /dev/mem with zeroing reads
	dvb-usb: don't use stack for firmware load
	dvb-usb-firmware: don't do DMA on stack
	virtio-console: avoid DMA from stack
	pegasus: Use heap buffers for all register access
	rtl8150: Use heap buffers for all register access
	catc: Combine failure cleanup code in catc_probe()
	catc: Use heap buffer for memory size test
	ibmveth: calculate gso_segs for large packets
	SUNRPC: fix refcounting problems with auth_gss messages.
	tty/serial: atmel: RS485 half duplex w/DMA: enable RX after TX is done
	net: ipv6: check route protocol when deleting routes
	sctp: deny peeloff operation on asocs with threads sleeping on it
	MIPS: fix Select HAVE_IRQ_EXIT_ON_IRQ_STACK patch.
	Linux 4.4.63

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ebff0104 81af21fe

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 62

SUBLEVEL = 63

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/mips/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ config CPU_MIPS32_R6 
	select CPU_SUPPORTS_MSA

	select GENERIC_CSUM

	select HAVE_KVM

	select MIPS_O32_FP64_SUPPORT if 32BIT

	select MIPS_O32_FP64_SUPPORT

	help

	  Choose this option to build a kernel for release 6 or later of the

	  MIPS32 architecture.  New MIPS processors, starting with the Warrior
@@ -1464,7 +1464,7 @@ config CPU_MIPS64_R6 
	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_MSA

	select GENERIC_CSUM

	select MIPS_O32_FP64_SUPPORT if MIPS32_O32

	select MIPS_O32_FP64_SUPPORT if 32BIT || MIPS32_O32

	help

	  Choose this option to build a kernel for release 6 or later of the

	  MIPS64 architecture.  New MIPS processors, starting with the Warrior

arch/mips/lantiq/irq.c

+21 −17
Original line number Diff line number Diff line
@@ -269,11 +269,6 @@ static void ltq_hw5_irqdispatch(void) 
DEFINE_HWx_IRQDISPATCH(5)

#endif



static void ltq_hw_irq_handler(struct irq_desc *desc)

{

	ltq_hw_irqdispatch(irq_desc_get_irq(desc) - 2);

}



#ifdef CONFIG_MIPS_MT_SMP

void __init arch_init_ipiirq(int irq, struct irqaction *action)

{
@@ -318,19 +313,23 @@ static struct irqaction irq_call = { 
asmlinkage void plat_irq_dispatch(void)

{

	unsigned int pending = read_c0_status() & read_c0_cause() & ST0_IM;

	int irq;

	unsigned int i;



	if (!pending) {

		spurious_interrupt();

		return;

	if ((MIPS_CPU_TIMER_IRQ == 7) && (pending & CAUSEF_IP7)) {

		do_IRQ(MIPS_CPU_TIMER_IRQ);

		goto out;

	} else {

		for (i = 0; i < MAX_IM; i++) {

			if (pending & (CAUSEF_IP2 << i)) {

				ltq_hw_irqdispatch(i);

				goto out;

			}

		}



	pending >>= CAUSEB_IP;

	while (pending) {

		irq = fls(pending) - 1;

		do_IRQ(MIPS_CPU_IRQ_BASE + irq);

		pending &= ~BIT(irq);

	}

	pr_alert("Spurious IRQ: CAUSE=0x%08x\n", read_c0_status());



out:

	return;

}



static int icu_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
@@ -355,6 +354,11 @@ static const struct irq_domain_ops irq_domain_ops = { 
	.map = icu_map,

};



static struct irqaction cascade = {

	.handler = no_action,

	.name = "cascade",

};



int __init icu_of_init(struct device_node *node, struct device_node *parent)

{

	struct device_node *eiu_node;
@@ -386,7 +390,7 @@ int __init icu_of_init(struct device_node *node, struct device_node *parent) 
	mips_cpu_irq_init();



	for (i = 0; i < MAX_IM; i++)

		irq_set_chained_handler(i + 2, ltq_hw_irq_handler);

		setup_irq(i + 2, &cascade);



	if (cpu_has_vint) {

		pr_info("Setting up vectored interrupts\n");

arch/powerpc/kernel/setup_64.c

+9 −0
Original line number Diff line number Diff line
@@ -220,6 +220,15 @@ static void cpu_ready_for_interrupts(void) 
		unsigned long lpcr = mfspr(SPRN_LPCR);

		mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3);

	}



	/*

	 * Fixup HFSCR:TM based on CPU features. The bit is set by our

	 * early asm init because at that point we haven't updated our

	 * CPU features from firmware and device-tree. Here we have,

	 * so let's do it.

	 */

	if (cpu_has_feature(CPU_FTR_HVMODE) && !cpu_has_feature(CPU_FTR_TM_COMP))

		mtspr(SPRN_HFSCR, mfspr(SPRN_HFSCR) & ~HFSCR_TM);

}



/*

arch/x86/entry/vdso/vdso32-setup.c

+9 −2
Original line number Diff line number Diff line
@@ -31,8 +31,10 @@ static int __init vdso32_setup(char *s) 
{

	vdso32_enabled = simple_strtoul(s, NULL, 0);



	if (vdso32_enabled > 1)

	if (vdso32_enabled > 1) {

		pr_warn("vdso32 values other than 0 and 1 are no longer allowed; vdso disabled\n");

		vdso32_enabled = 0;

	}



	return 1;

}
@@ -63,13 +65,18 @@ subsys_initcall(sysenter_setup); 
/* Register vsyscall32 into the ABI table */

#include <linux/sysctl.h>



static const int zero;

static const int one = 1;



static struct ctl_table abi_table2[] = {

	{

		.procname	= "vsyscall32",

		.data		= &vdso32_enabled,

		.maxlen		= sizeof(int),

		.mode		= 0644,

		.proc_handler	= proc_dointvec

		.proc_handler	= proc_dointvec_minmax,

		.extra1		= (int *)&zero,

		.extra2		= (int *)&one,

	},

	{}

};