From 86f9ba80227a4f3320d4d9f2a66f72ef7254aec2 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Wed, 21 Nov 2012 23:29:12 +0000 Subject: [PATCH] --- yaml --- r: 343571 b: refs/heads/master c: 05dd85f7933ffbe6d71415e631c95ca615ae1e81 h: refs/heads/master i: 343569: 43805065564716e564d16201c4e807f2157ae388 343567: 253801e37120aa10fe85c9df3949bf65dc09caf5 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d61e8502e661..0954bce02e70 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a64fd707481631b9682f9baeefac489bc55bbf73 +refs/heads/master: 05dd85f7933ffbe6d71415e631c95ca615ae1e81 diff --git a/trunk/arch/powerpc/kvm/book3s_64_mmu_hv.c b/trunk/arch/powerpc/kvm/book3s_64_mmu_hv.c index 1029e2201bf6..ac6b5acb99b9 100644 --- a/trunk/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/trunk/arch/powerpc/kvm/book3s_64_mmu_hv.c @@ -1282,7 +1282,6 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf, while (nb + sizeof(hdr) + HPTE_SIZE < count) { /* Initialize header */ hptr = (struct kvm_get_htab_header __user *)buf; - hdr.index = i; hdr.n_valid = 0; hdr.n_invalid = 0; nw = nb; @@ -1298,6 +1297,7 @@ static ssize_t kvm_htab_read(struct file *file, char __user *buf, ++revp; } } + hdr.index = i; /* Grab a series of valid entries */ while (i < kvm->arch.hpt_npte &&