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

Commit 5f78b91f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents 73e234e4 736862fd

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 */