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

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

Merge 3.18.16 into android-3.18 



Changes in 3.18.16:
	md/raid0: fix restore to sector variable in raid0_make_request
	arch/x86/kvm/mmu.c: work around gcc-4.4.4 bug
	Linux 3.18.16

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents d5585262 d048c068

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 15

SUBLEVEL = 16

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/x86/kvm/mmu.c

+7 −7
Original line number Diff line number Diff line
@@ -4103,13 +4103,13 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, 
	u64 entry, gentry, *spte;

	int npte;

	bool remote_flush, local_flush, zap_page;

	union kvm_mmu_page_role mask = (union kvm_mmu_page_role) {

		.cr0_wp = 1,

		.cr4_pae = 1,

		.nxe = 1,

		.smep_andnot_wp = 1,

		.smap_andnot_wp = 1,

	};

	union kvm_mmu_page_role mask = { };



	mask.cr0_wp = 1;

	mask.cr4_pae = 1;

	mask.nxe = 1;

	mask.smep_andnot_wp = 1;

	mask.smap_andnot_wp = 1;



	/*

	 * If we don't have indirect shadow pages, it means no page is

drivers/md/raid0.c

+3 −1
Original line number Diff line number Diff line
@@ -530,6 +530,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) 
			 ? (sector & (chunk_sects-1))

			 : sector_div(sector, chunk_sects));



		/* Restore due to sector_div */

		sector = bio->bi_iter.bi_sector;



		if (sectors < bio_sectors(bio)) {

			split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set);

			bio_chain(split, bio);
@@ -537,7 +540,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) 
			split = bio;

		}



		sector = bio->bi_iter.bi_sector;

		zone = find_zone(mddev->private, &sector);

		tmp_dev = map_sector(mddev, zone, sector, &sector);

		split->bi_bdev = tmp_dev->bdev;