Message ID | 1468284892-27765-1-git-send-email-dja@axtens.net (mailing list archive) |
---|---|
State | Accepted |
Headers | show |
On Tue, 2016-12-07 at 00:54:48 UTC, Daniel Axtens wrote: > kvmppc_h_put_tce_indirect labels a u64 pointer as __user. It also > labelled the u64 where get_user puts the result as __user. This isn't > a pointer and so doesn't need to be labelled __user. > > Split the u64 value definition onto a new line to make it clear that > it doesn't get the annotation. > > Signed-off-by: Daniel Axtens <dja@axtens.net> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/f8750513b7001d5ae96313d4e1 cheers
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c index 18cf6d1f8174..c379ff5a4438 100644 --- a/arch/powerpc/kvm/book3s_64_vio.c +++ b/arch/powerpc/kvm/book3s_64_vio.c @@ -242,7 +242,8 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, struct kvmppc_spapr_tce_table *stt; long i, ret = H_SUCCESS, idx; unsigned long entry, ua = 0; - u64 __user *tces, tce; + u64 __user *tces; + u64 tce; stt = kvmppc_find_table(vcpu, liobn); if (!stt)
kvmppc_h_put_tce_indirect labels a u64 pointer as __user. It also labelled the u64 where get_user puts the result as __user. This isn't a pointer and so doesn't need to be labelled __user. Split the u64 value definition onto a new line to make it clear that it doesn't get the annotation. Signed-off-by: Daniel Axtens <dja@axtens.net> --- arch/powerpc/kvm/book3s_64_vio.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)