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

Commit 736862fd authored by Kyle Yan's avatar Kyle Yan
Browse files

Merge remote-tracking branch '4.9/tmp-bae751b9' into msm-4.9 



* 4.9/tmp-bae751b9:
  Linux 4.9.25
  device-dax: switch to srcu, fix rcu_read_lock() vs pte allocation
  x86/mce: Make the MCE notifier a blocking one
  x86/mce/AMD: Give a name to MCA bank 3 when accessed with legacy MSRs
  powerpc/kprobe: Fix oops when kprobed on 'stdu' instruction
  ubi/upd: Always flush after prepared for an update
  mac80211: fix MU-MIMO follow-MAC mode
  mac80211: reject ToDS broadcast data frames
  ubifs: Fix O_TMPFILE corner case in ubifs_link()
  ubifs: Fix RENAME_WHITEOUT support
  mmc: sdhci-esdhc-imx: increase the pad I/O drive strength for DDR50 card
  ACPI / power: Avoid maybe-uninitialized warning
  Input: elantech - add Fujitsu Lifebook E547 to force crc_enabled
  s390/mm: fix CMMA vs KSM vs others
  CIFS: remove bad_network_name flag
  cifs: Do not send echoes before Negotiate is complete
  mm: prevent NR_ISOLATE_* stats from going negative
  ring-buffer: Have ring_buffer_iter_empty() return true when empty
  tracing: Allocate the snapshot buffer before enabling probe
  KEYS: fix keyctl_set_reqkey_keyring() to not leak thread keyrings
  KEYS: Change the name of the dead type to ".dead" to prevent user access
  KEYS: Disallow keyrings beginning with '.' to be joined as session keyrings
  Revert "ANDROID: [RFC]cgroup: Change from CAP_SYS_NICE to CAP_SYS_RESOURCE for cgroup migration permissions"

Change-Id: I125728abe9c39c28e3dd31b50d2161e5f74c6575
Signed-off-by: default avatarKyle Yan <kyan@codeaurora.org>
parents 16496105 bae751b9

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 24

SUBLEVEL = 25

EXTRAVERSION =

NAME = Roaring Lionus

arch/powerpc/kernel/entry_64.S

+3 −3
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ resume_kernel: 


	addi	r8,r1,INT_FRAME_SIZE	/* Get the kprobed function entry */



	lwz	r3,GPR1(r1)

	ld	r3,GPR1(r1)

	subi	r3,r3,INT_FRAME_SIZE	/* dst: Allocate a trampoline exception frame */

	mr	r4,r1			/* src:  current exception frame */

	mr	r1,r3			/* Reroute the trampoline frame to r1 */
@@ -703,8 +703,8 @@ resume_kernel: 
	addi	r6,r6,8

	bdnz	2b



	/* Do real store operation to complete stwu */

	lwz	r5,GPR1(r1)

	/* Do real store operation to complete stdu */

	ld	r5,GPR1(r1)

	std	r8,0(r5)



	/* Clear _TIF_EMULATE_STACK_STORE flag */

arch/s390/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -1029,6 +1029,8 @@ int get_guest_storage_key(struct mm_struct *mm, unsigned long addr, 
static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,

			      pte_t *ptep, pte_t entry)

{

	if (pte_present(entry))

		pte_val(entry) &= ~_PAGE_UNUSED;

	if (mm_has_pgste(mm))

		ptep_set_pte_at(mm, addr, ptep, entry);

	else

arch/x86/kernel/cpu/mcheck/mce-genpool.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ void mce_gen_pool_process(void) 
	head = llist_reverse_order(head);

	llist_for_each_entry_safe(node, tmp, head, llnode) {

		mce = &node->mce;

		atomic_notifier_call_chain(&x86_mce_decoder_chain, 0, mce);

		blocking_notifier_call_chain(&x86_mce_decoder_chain, 0, mce);

		gen_pool_free(mce_evt_pool, (unsigned long)node, sizeof(*node));

	}

}

arch/x86/kernel/cpu/mcheck/mce-internal.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ enum severity_level { 
	MCE_PANIC_SEVERITY,

};



extern struct atomic_notifier_head x86_mce_decoder_chain;

extern struct blocking_notifier_head x86_mce_decoder_chain;



#define ATTR_LEN		16

#define INITIAL_CHECK_INTERVAL	5 * 60 /* 5 minutes */