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

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

Merge 4.4.141 into android-4.4 



Changes in 4.4.141
	MIPS: Fix ioremap() RAM check
	ibmasm: don't write out of bounds in read handler
	vmw_balloon: fix inflation with batching
	ahci: Disable LPM on Lenovo 50 series laptops with a too old BIOS
	USB: serial: ch341: fix type promotion bug in ch341_control_in()
	USB: serial: cp210x: add another USB ID for Qivicon ZigBee stick
	USB: serial: keyspan_pda: fix modem-status error handling
	USB: yurex: fix out-of-bounds uaccess in read handler
	USB: serial: mos7840: fix status-register error handling
	usb: quirks: add delay quirks for Corsair Strafe
	xhci: xhci-mem: off by one in xhci_stream_id_to_ring()
	HID: usbhid: add quirk for innomedia INNEX GENESIS/ATARI adapter
	Fix up non-directory creation in SGID directories
	tools build: fix # escaping in .cmd files for future Make
	iw_cxgb4: correctly enforce the max reg_mr depth
	x86/cpufeature: Move some of the scattered feature bits to x86_capability
	x86/cpufeature: Cleanup get_cpu_cap()
	x86/cpu: Provide a config option to disable static_cpu_has
	x86/fpu: Add an XSTATE_OP() macro
	x86/fpu: Get rid of xstate_fault()
	x86/headers: Don't include asm/processor.h in asm/atomic.h
	x86/cpufeature: Carve out X86_FEATURE_*
	x86/cpufeature: Replace the old static_cpu_has() with safe variant
	x86/cpufeature: Get rid of the non-asm goto variant
	x86/alternatives: Add an auxilary section
	x86/alternatives: Discard dynamic check after init
	x86/vdso: Use static_cpu_has()
	x86/boot: Simplify kernel load address alignment check
	x86/cpufeature: Speed up cpu_feature_enabled()
	x86/cpufeature, x86/mm/pkeys: Add protection keys related CPUID definitions
	x86/mm/pkeys: Fix mismerge of protection keys CPUID bits
	x86/cpu: Add detection of AMD RAS Capabilities
	x86/cpufeature, x86/mm/pkeys: Fix broken compile-time disabling of pkeys
	x86/cpufeature: Update cpufeaure macros
	x86/cpufeature: Make sure DISABLED/REQUIRED macros are updated
	x86/cpufeature: Add helper macro for mask check macros
	uprobes/x86: Remove incorrect WARN_ON() in uprobe_init_insn()
	netfilter: nf_queue: augment nfqa_cfg_policy
	netfilter: x_tables: initialise match/target check parameter struct
	loop: add recursion validation to LOOP_CHANGE_FD
	PM / hibernate: Fix oops at snapshot_write()
	RDMA/ucm: Mark UCM interface as BROKEN
	loop: remember whether sysfs_create_group() was done
	Linux 4.4.141

Change-Id: I777b39a0ede95b58638add97756d6beaf4a9d154
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ed9bdc8a b3c6be58

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


	clearcpuid=BITNUM [X86]

			Disable CPUID feature X for the kernel. See

			arch/x86/include/asm/cpufeature.h for the valid bit

			arch/x86/include/asm/cpufeatures.h for the valid bit

			numbers. Note the Linux specific bits are not necessarily

			stable over kernel options, but the vendor specific

			ones should be.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 140

SUBLEVEL = 141

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/mips/mm/ioremap.c

+25 −12
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/module.h>

#include <asm/addrspace.h>

#include <asm/byteorder.h>

#include <linux/ioport.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <linux/vmalloc.h>
@@ -97,6 +98,20 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr, 
	return error;

}



static int __ioremap_check_ram(unsigned long start_pfn, unsigned long nr_pages,

			       void *arg)

{

	unsigned long i;



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

		if (pfn_valid(start_pfn + i) &&

		    !PageReserved(pfn_to_page(start_pfn + i)))

			return 1;

	}



	return 0;

}



/*

 * Generic mapping function (not visible outside):

 */
@@ -115,8 +130,8 @@ static int remap_area_pages(unsigned long address, phys_addr_t phys_addr, 


void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long flags)

{

	unsigned long offset, pfn, last_pfn;

	struct vm_struct * area;

	unsigned long offset;

	phys_addr_t last_addr;

	void * addr;
@@ -136,17 +151,15 @@ void __iomem * __ioremap(phys_addr_t phys_addr, phys_addr_t size, unsigned long 
		return (void __iomem *) CKSEG1ADDR(phys_addr);



	/*

	 * Don't allow anybody to remap normal RAM that we're using..

	 * Don't allow anybody to remap RAM that may be allocated by the page

	 * allocator, since that could lead to races & data clobbering.

	 */

	if (phys_addr < virt_to_phys(high_memory)) {

		char *t_addr, *t_end;

		struct page *page;



		t_addr = __va(phys_addr);

		t_end = t_addr + (size - 1);



		for(page = virt_to_page(t_addr); page <= virt_to_page(t_end); page++)

			if(!PageReserved(page))

	pfn = PFN_DOWN(phys_addr);

	last_pfn = PFN_DOWN(last_addr);

	if (walk_system_ram_range(pfn, last_pfn - pfn + 1, NULL,

				  __ioremap_check_ram) == 1) {

		WARN_ONCE(1, "ioremap on RAM at %pa - %pa\n",

			  &phys_addr, &last_addr);

		return NULL;

	}

arch/x86/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -369,6 +369,17 @@ config X86_FEATURE_NAMES 


	  If in doubt, say Y.



config X86_FAST_FEATURE_TESTS

	bool "Fast CPU feature tests" if EMBEDDED

	default y

	---help---

	  Some fast-paths in the kernel depend on the capabilities of the CPU.

	  Say Y here for the kernel to patch in the appropriate code at runtime

	  based on the capabilities of the CPU. The infrastructure for patching

	  code at runtime takes up some additional space; space-constrained

	  embedded systems may wish to say N here to produce smaller, slightly

	  slower code.



config X86_X2APIC

	bool "Support x2apic"

	depends on X86_LOCAL_APIC && X86_64 && (IRQ_REMAP || HYPERVISOR_GUEST)

arch/x86/Kconfig.debug

+0 −10
Original line number Diff line number Diff line
@@ -355,16 +355,6 @@ config DEBUG_IMR_SELFTEST 


	  If unsure say N here.



config X86_DEBUG_STATIC_CPU_HAS

	bool "Debug alternatives"

	depends on DEBUG_KERNEL

	---help---

	  This option causes additional code to be generated which

	  fails if static_cpu_has() is used before alternatives have

	  run.



	  If unsure, say N.



config X86_DEBUG_FPU

	bool "Debug the x86 FPU code"

	depends on DEBUG_KERNEL