Contents of /trunk/kernel-alx/patches-3.18/0115-3.18.16-all-fixes.patch
Parent Directory | Revision Log
Revision 2616 -
(show annotations)
(download)
Mon Jul 13 08:29:01 2015 UTC (9 years, 2 months ago) by niro
File size: 1698 byte(s)
Mon Jul 13 08:29:01 2015 UTC (9 years, 2 months ago) by niro
File size: 1698 byte(s)
-linux-3.18.16
1 | diff --git a/Makefile b/Makefile |
2 | index cda98de8cd31..d84fdc6d02f4 100644 |
3 | --- a/Makefile |
4 | +++ b/Makefile |
5 | @@ -1,6 +1,6 @@ |
6 | VERSION = 3 |
7 | PATCHLEVEL = 18 |
8 | -SUBLEVEL = 15 |
9 | +SUBLEVEL = 16 |
10 | EXTRAVERSION = |
11 | NAME = Diseased Newt |
12 | |
13 | diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c |
14 | index 8bd81f5a7e07..f696dedb0fa7 100644 |
15 | --- a/arch/x86/kvm/mmu.c |
16 | +++ b/arch/x86/kvm/mmu.c |
17 | @@ -4103,13 +4103,13 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, |
18 | u64 entry, gentry, *spte; |
19 | int npte; |
20 | bool remote_flush, local_flush, zap_page; |
21 | - union kvm_mmu_page_role mask = (union kvm_mmu_page_role) { |
22 | - .cr0_wp = 1, |
23 | - .cr4_pae = 1, |
24 | - .nxe = 1, |
25 | - .smep_andnot_wp = 1, |
26 | - .smap_andnot_wp = 1, |
27 | - }; |
28 | + union kvm_mmu_page_role mask = { }; |
29 | + |
30 | + mask.cr0_wp = 1; |
31 | + mask.cr4_pae = 1; |
32 | + mask.nxe = 1; |
33 | + mask.smep_andnot_wp = 1; |
34 | + mask.smap_andnot_wp = 1; |
35 | |
36 | /* |
37 | * If we don't have indirect shadow pages, it means no page is |
38 | diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c |
39 | index d5c12e5b6125..b974ff29b55c 100644 |
40 | --- a/drivers/md/raid0.c |
41 | +++ b/drivers/md/raid0.c |
42 | @@ -530,6 +530,9 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) |
43 | ? (sector & (chunk_sects-1)) |
44 | : sector_div(sector, chunk_sects)); |
45 | |
46 | + /* Restore due to sector_div */ |
47 | + sector = bio->bi_iter.bi_sector; |
48 | + |
49 | if (sectors < bio_sectors(bio)) { |
50 | split = bio_split(bio, sectors, GFP_NOIO, fs_bio_set); |
51 | bio_chain(split, bio); |
52 | @@ -537,7 +540,6 @@ static void raid0_make_request(struct mddev *mddev, struct bio *bio) |
53 | split = bio; |
54 | } |
55 | |
56 | - sector = bio->bi_iter.bi_sector; |
57 | zone = find_zone(mddev->private, §or); |
58 | tmp_dev = map_sector(mddev, zone, sector, §or); |
59 | split->bi_bdev = tmp_dev->bdev; |