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

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

Merge 4.9.135 into android-4.9 



Changes in 4.9.135
	media: af9035: prevent buffer overflow on write
	batman-adv: Fix segfault when writing to throughput_override
	batman-adv: Fix segfault when writing to sysfs elp_interval
	batman-adv: Prevent duplicated nc_node entry
	batman-adv: Prevent duplicated softif_vlan entry
	batman-adv: Prevent duplicated global TT entry
	batman-adv: Prevent duplicated tvlv handler
	batman-adv: fix backbone_gw refcount on queue_work() failure
	batman-adv: fix hardif_neigh refcount on queue_work() failure
	clocksource/drivers/ti-32k: Add CLOCK_SOURCE_SUSPEND_NONSTOP flag for non-am43 SoCs
	scsi: ibmvscsis: Fix a stringop-overflow warning
	scsi: ibmvscsis: Ensure partition name is properly NUL terminated
	Input: atakbd - fix Atari keymap
	Input: atakbd - fix Atari CapsLock behaviour
	ravb: do not write 1 to reserved bits
	drm: mali-dp: Call drm_crtc_vblank_reset on device init
	scsi: sd: don't crash the host on invalid commands
	net/mlx4: Use cpumask_available for eq->affinity_mask
	powerpc/tm: Fix userspace r13 corruption
	powerpc/tm: Avoid possible userspace r1 corruption on reclaim
	iommu/amd: Return devid as alias for ACPI HID devices
	mremap: properly flush TLB before releasing the page
	mm: Preserve _PAGE_DEVMAP across mprotect() calls
	netfilter: check for seqadj ext existence before adding it in nf_nat_setup_info
	ARC: build: Get rid of toolchain check
	ARC: build: Don't set CROSS_COMPILE in arch's Makefile
	HID: quirks: fix support for Apple Magic Keyboards
	usb: gadget: serial: fix oops when data rx'd after close
	sched/cputime: Convert kcpustat to nsecs
	macintosh/rack-meter: Convert cputime64_t use to u64
	sched/cputime: Increment kcpustat directly on irqtime account
	sched/cputime: Fix ksoftirqd cputime accounting regression
	ext4: avoid running out of journal credits when appending to an inline file
	HV: properly delay KVP packets when negotiation is in progress
	Linux 4.9.135

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents e8abd40f b24c9962

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 134

SUBLEVEL = 135

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/Makefile

+1 −23
Original line number Diff line number Diff line
@@ -8,34 +8,12 @@ 


UTS_MACHINE := arc



ifeq ($(CROSS_COMPILE),)

ifndef CONFIG_CPU_BIG_ENDIAN

CROSS_COMPILE := arc-linux-

else

CROSS_COMPILE := arceb-linux-

endif

endif



KBUILD_DEFCONFIG := nsim_700_defconfig



cflags-y	+= -fno-common -pipe -fno-builtin -mmedium-calls -D__linux__

cflags-$(CONFIG_ISA_ARCOMPACT)	+= -mA7

cflags-$(CONFIG_ISA_ARCV2)	+= -mcpu=archs



is_700 = $(shell $(CC) -dM -E - < /dev/null | grep -q "ARC700" && echo 1 || echo 0)



ifdef CONFIG_ISA_ARCOMPACT

ifeq ($(is_700), 0)

    $(error Toolchain not configured for ARCompact builds)

endif

endif



ifdef CONFIG_ISA_ARCV2

ifeq ($(is_700), 1)

    $(error Toolchain not configured for ARCv2 builds)

endif

endif



ifdef CONFIG_ARC_CURR_IN_REG

# For a global register defintion, make sure it gets passed to every file

# We had a customer reported bug where some code built in kernel was NOT using
@@ -89,7 +67,7 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB 
# --build-id w/o "-marclinux". Default arc-elf32-ld is OK

ldflags-$(upto_gcc44)			+= -marclinux



LIBGCC	:= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)

LIBGCC	= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)



# Modules with short calls might break for calls into builtin-kernel

KBUILD_CFLAGS_MODULE	+= -mlong-calls -mno-millicode

arch/powerpc/kernel/tm.S

+17 −3
Original line number Diff line number Diff line
@@ -166,13 +166,27 @@ _GLOBAL(tm_reclaim) 
	std	r1, PACATMSCRATCH(r13)

	ld	r1, PACAR1(r13)



	/* Store the PPR in r11 and reset to decent value */

	std	r11, GPR11(r1)			/* Temporary stash */



	/*

	 * Move the saved user r1 to the kernel stack in case PACATMSCRATCH is

	 * clobbered by an exception once we turn on MSR_RI below.

	 */

	ld	r11, PACATMSCRATCH(r13)

	std	r11, GPR1(r1)



	/*

	 * Store r13 away so we can free up the scratch SPR for the SLB fault

	 * handler (needed once we start accessing the thread_struct).

	 */

	GET_SCRATCH0(r11)

	std	r11, GPR13(r1)



	/* Reset MSR RI so we can take SLB faults again */

	li	r11, MSR_RI

	mtmsrd	r11, 1



	/* Store the PPR in r11 and reset to decent value */

	mfspr	r11, SPRN_PPR

	HMT_MEDIUM
@@ -197,11 +211,11 @@ _GLOBAL(tm_reclaim) 
	SAVE_GPR(8, r7)				/* user r8 */

	SAVE_GPR(9, r7)				/* user r9 */

	SAVE_GPR(10, r7)			/* user r10 */

	ld	r3, PACATMSCRATCH(r13)		/* user r1 */

	ld	r3, GPR1(r1)			/* user r1 */

	ld	r4, GPR7(r1)			/* user r7 */

	ld	r5, GPR11(r1)			/* user r11 */

	ld	r6, GPR12(r1)			/* user r12 */

	GET_SCRATCH0(8)				/* user r13 */

	ld	r8, GPR13(r1)			/* user r13 */

	std	r3, GPR1(r7)

	std	r4, GPR7(r7)

	std	r5, GPR11(r7)

arch/s390/appldata/appldata_os.c

+8 −8
Original line number Diff line number Diff line
@@ -113,21 +113,21 @@ static void appldata_get_os_data(void *data) 
	j = 0;

	for_each_online_cpu(i) {

		os_data->os_cpu[j].per_cpu_user =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_USER]);

		os_data->os_cpu[j].per_cpu_nice =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_NICE]);

		os_data->os_cpu[j].per_cpu_system =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]);

		os_data->os_cpu[j].per_cpu_idle =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IDLE]);

		os_data->os_cpu[j].per_cpu_irq =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IRQ]);

		os_data->os_cpu[j].per_cpu_softirq =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_SOFTIRQ]);

		os_data->os_cpu[j].per_cpu_iowait =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_IOWAIT]);

		os_data->os_cpu[j].per_cpu_steal =

			cputime_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);

			nsecs_to_jiffies(kcpustat_cpu(i).cpustat[CPUTIME_STEAL]);

		os_data->os_cpu[j].cpu_id = i;

		j++;

	}

arch/x86/include/asm/pgtable_types.h

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ 
 */

#define _PAGE_CHG_MASK	(PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT |		\

			 _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY |	\

			 _PAGE_SOFT_DIRTY)

			 _PAGE_SOFT_DIRTY | _PAGE_DEVMAP)

#define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE)



/* The ASID is the lower 12 bits of CR3 */