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

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

Merge 4.4.77 into android-4.4 



Changes in 4.4.77
	fs: add a VALID_OPEN_FLAGS
	fs: completely ignore unknown open flags
	driver core: platform: fix race condition with driver_override
	bgmac: reset & enable Ethernet core before using it
	mm: fix classzone_idx underflow in shrink_zones()
	tracing/kprobes: Allow to create probe with a module name starting with a digit
	drm/virtio: don't leak bo on drm_gem_object_init failure
	usb: dwc3: replace %p with %pK
	USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick
	Add USB quirk for HVR-950q to avoid intermittent device resets
	usb: usbip: set buffer pointers to NULL after free
	usb: Fix typo in the definition of Endpoint[out]Request
	mac80211_hwsim: Replace bogus hrtimer clockid
	sysctl: don't print negative flag for proc_douintvec
	sysctl: report EINVAL if value is larger than UINT_MAX for proc_douintvec
	pinctrl: sh-pfc: r8a7791: Fix SCIF2 pinmux data
	pinctrl: meson: meson8b: fix the NAND DQS pins
	pinctrl: sunxi: Fix SPDIF function name for A83T
	pinctrl: mxs: atomically switch mux and drive strength config
	pinctrl: sh-pfc: Update info pointer after SoC-specific init
	USB: serial: option: add two Longcheer device ids
	USB: serial: qcserial: new Sierra Wireless EM7305 device ID
	gfs2: Fix glock rhashtable rcu bug
	x86/tools: Fix gcc-7 warning in relocs.c
	x86/uaccess: Optimize copy_user_enhanced_fast_string() for short strings
	ath10k: override CE5 config for QCA9377
	KEYS: Fix an error code in request_master_key()
	RDMA/uverbs: Check port number supplied by user verbs cmds
	mqueue: fix a use-after-free in sys_mq_notify()
	tools include: Add a __fallthrough statement
	tools string: Use __fallthrough in perf_atoll()
	tools strfilter: Use __fallthrough
	perf top: Use __fallthrough
	perf intel-pt: Use __fallthrough
	perf thread_map: Correctly size buffer used with dirent->dt_name
	perf scripting perl: Fix compile error with some perl5 versions
	perf tests: Avoid possible truncation with dirent->d_name + snprintf
	perf bench numa: Avoid possible truncation when using snprintf()
	perf tools: Use readdir() instead of deprecated readdir_r()
	perf thread_map: Use readdir() instead of deprecated readdir_r()
	perf script: Use readdir() instead of deprecated readdir_r()
	perf tools: Remove duplicate const qualifier
	perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed
	perf pmu: Fix misleadingly indented assignment (whitespace)
	perf dwarf: Guard !x86_64 definitions under #ifdef else clause
	perf trace: Do not process PERF_RECORD_LOST twice
	perf tests: Remove wrong semicolon in while loop in CQM test
	perf tools: Use readdir() instead of deprecated readdir_r() again
	md: fix incorrect use of lexx_to_cpu in does_sb_need_changing
	md: fix super_offset endianness in super_1_rdev_size_change
	tcp: fix tcp_mark_head_lost to check skb len before fragmenting
	staging: vt6556: vnt_start Fix missing call to vnt_key_init_table.
	staging: comedi: fix clean-up of comedi_class in comedi_init()
	ext4: check return value of kstrtoull correctly in reserved_clusters_store
	x86/mm/pat: Don't report PAT on CPUs that don't support it
	saa7134: fix warm Medion 7134 EEPROM read
	Linux 4.4.77

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 39140a0f 9e0499d7

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 76

SUBLEVEL = 77

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/x86/include/asm/pat.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
bool pat_enabled(void);

void pat_disable(const char *reason);

extern void pat_init(void);

extern void init_cache_modes(void);



extern int reserve_memtype(u64 start, u64 end,

		enum page_cache_mode req_pcm, enum page_cache_mode *ret_pcm);

arch/x86/kernel/setup.c

+7 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,13 @@ void __init setup_arch(char **cmdline_p) 
	if (mtrr_trim_uncached_memory(max_pfn))

		max_pfn = e820_end_of_ram_pfn();



	/*

	 * This call is required when the CPU does not support PAT. If

	 * mtrr_bp_init() invoked it already via pat_init() the call has no

	 * effect.

	 */

	init_cache_modes();



#ifdef CONFIG_X86_32

	/* max_low_pfn get updated here */

	find_low_pfn_range();

arch/x86/lib/copy_user_64.S

+5 −2
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ ENTRY(copy_user_generic_unrolled) 
	movl %edx,%ecx

	andl $63,%edx

	shrl $6,%ecx

	jz 17f

	jz .L_copy_short_string

1:	movq (%rsi),%r8

2:	movq 1*8(%rsi),%r9

3:	movq 2*8(%rsi),%r10
@@ -101,7 +101,8 @@ ENTRY(copy_user_generic_unrolled) 
	leaq 64(%rdi),%rdi

	decl %ecx

	jnz 1b

17:	movl %edx,%ecx

.L_copy_short_string:

	movl %edx,%ecx

	andl $7,%edx

	shrl $3,%ecx

	jz 20f
@@ -215,6 +216,8 @@ ENDPROC(copy_user_generic_string) 
 */

ENTRY(copy_user_enhanced_fast_string)

	ASM_STAC

	cmpl $64,%edx

	jb .L_copy_short_string	/* less then 64 bytes, avoid the costly 'rep' */

	movl %edx,%ecx

1:	rep

	movsb

arch/x86/mm/pat.c

+12 −16
Original line number Diff line number Diff line
@@ -36,14 +36,14 @@ 
#undef pr_fmt

#define pr_fmt(fmt) "" fmt



static bool boot_cpu_done;



static int __read_mostly __pat_enabled = IS_ENABLED(CONFIG_X86_PAT);

static void init_cache_modes(void);

static bool __read_mostly boot_cpu_done;

static bool __read_mostly pat_disabled = !IS_ENABLED(CONFIG_X86_PAT);

static bool __read_mostly pat_initialized;

static bool __read_mostly init_cm_done;



void pat_disable(const char *reason)

{

	if (!__pat_enabled)

	if (pat_disabled)

		return;



	if (boot_cpu_done) {
@@ -51,10 +51,8 @@ void pat_disable(const char *reason) 
		return;

	}



	__pat_enabled = 0;

	pat_disabled = true;

	pr_info("x86/PAT: %s\n", reason);



	init_cache_modes();

}



static int __init nopat(char *str)
@@ -66,7 +64,7 @@ early_param("nopat", nopat); 


bool pat_enabled(void)

{

	return !!__pat_enabled;

	return pat_initialized;

}

EXPORT_SYMBOL_GPL(pat_enabled);
@@ -204,6 +202,8 @@ static void __init_cache_modes(u64 pat) 
		update_cache_mode_entry(i, cache);

	}

	pr_info("x86/PAT: Configuration [0-7]: %s\n", pat_msg);



	init_cm_done = true;

}



#define PAT(x, y)	((u64)PAT_ ## y << ((x)*8))
@@ -224,6 +224,7 @@ static void pat_bsp_init(u64 pat) 
	}



	wrmsrl(MSR_IA32_CR_PAT, pat);

	pat_initialized = true;



	__init_cache_modes(pat);

}
@@ -241,10 +242,9 @@ static void pat_ap_init(u64 pat) 
	wrmsrl(MSR_IA32_CR_PAT, pat);

}



static void init_cache_modes(void)

void init_cache_modes(void)

{

	u64 pat = 0;

	static int init_cm_done;



	if (init_cm_done)

		return;
@@ -286,8 +286,6 @@ static void init_cache_modes(void) 
	}



	__init_cache_modes(pat);



	init_cm_done = 1;

}



/**
@@ -305,10 +303,8 @@ void pat_init(void) 
	u64 pat;

	struct cpuinfo_x86 *c = &boot_cpu_data;



	if (!pat_enabled()) {

		init_cache_modes();

	if (pat_disabled)

		return;

	}



	if ((c->x86_vendor == X86_VENDOR_INTEL) &&

	    (((c->x86 == 0x6) && (c->x86_model <= 0xd)) ||