Commit 2dddb041 authored by popcornmix's avatar popcornmix
Browse files

Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y

parents b017e4f9 5d7a76ac

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 56

SUBLEVEL = 57

EXTRAVERSION =

NAME = Roaring Lionus

arch/mips/math-emu/cp1emu.c

+0 −2
Original line number Diff line number Diff line
@@ -2386,7 +2386,6 @@ dcopuop: 
					break;

				default:

					/* Reserved R6 ops */

					pr_err("Reserved MIPS R6 CMP.condn.S operation\n");

					return SIGILL;

				}

			}
@@ -2460,7 +2459,6 @@ dcopuop: 
					break;

				default:

					/* Reserved R6 ops */

					pr_err("Reserved MIPS R6 CMP.condn.D operation\n");

					return SIGILL;

				}

			}

arch/x86/include/asm/alternative-asm.h

+3 −1
Original line number Diff line number Diff line
@@ -62,8 +62,10 @@ 
#define new_len2		145f-144f



/*

 * max without conditionals. Idea adapted from:

 * gas compatible max based on the idea from:

 * http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax

 *

 * The additional "-" is needed because gas uses a "true" value of -1.

 */

#define alt_max_short(a, b)	((a) ^ (((a) ^ (b)) & -(-((a) < (b)))))

arch/x86/include/asm/alternative.h

+3 −3
Original line number Diff line number Diff line
@@ -103,12 +103,12 @@ static inline int alternatives_text_reserved(void *start, void *end) 
	alt_end_marker ":\n"



/*

 * max without conditionals. Idea adapted from:

 * gas compatible max based on the idea from:

 * http://graphics.stanford.edu/~seander/bithacks.html#IntegerMinOrMax

 *

 * The additional "-" is needed because gas works with s32s.

 * The additional "-" is needed because gas uses a "true" value of -1.

 */

#define alt_max_short(a, b)	"((" a ") ^ (((" a ") ^ (" b ")) & -(-((" a ") - (" b ")))))"

#define alt_max_short(a, b)	"((" a ") ^ (((" a ") ^ (" b ")) & -(-((" a ") < (" b ")))))"



/*

 * Pad the second replacement alternative with additional NOPs if it is

arch/x86/kvm/mmu.c

+8 −7
Original line number Diff line number Diff line
@@ -3648,13 +3648,6 @@ static bool sync_mmio_spte(struct kvm_vcpu *vcpu, u64 *sptep, gfn_t gfn, 
static inline bool is_last_gpte(struct kvm_mmu *mmu,

				unsigned level, unsigned gpte)

{

	/*

	 * PT_PAGE_TABLE_LEVEL always terminates.  The RHS has bit 7 set

	 * iff level <= PT_PAGE_TABLE_LEVEL, which for our purpose means

	 * level == PT_PAGE_TABLE_LEVEL; set PT_PAGE_SIZE_MASK in gpte then.

	 */

	gpte |= level - PT_PAGE_TABLE_LEVEL - 1;



	/*

	 * The RHS has bit 7 set iff level < mmu->last_nonleaf_level.

	 * If it is clear, there are no large pages at this level, so clear
@@ -3662,6 +3655,13 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, 
	 */

	gpte &= level - mmu->last_nonleaf_level;



	/*

	 * PT_PAGE_TABLE_LEVEL always terminates.  The RHS has bit 7 set

	 * iff level <= PT_PAGE_TABLE_LEVEL, which for our purpose means

	 * level == PT_PAGE_TABLE_LEVEL; set PT_PAGE_SIZE_MASK in gpte then.

	 */

	gpte |= level - PT_PAGE_TABLE_LEVEL - 1;



	return gpte & PT_PAGE_SIZE_MASK;

}
@@ -4169,6 +4169,7 @@ void kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, bool execonly) 


	update_permission_bitmask(vcpu, context, true);

	update_pkru_bitmask(vcpu, context, true);

	update_last_nonleaf_level(vcpu, context);

	reset_rsvds_bits_mask_ept(vcpu, context, execonly);

	reset_ept_shadow_zero_bits_mask(vcpu, context, execonly);

}