x86: two trivial sparse annotations
PATCH 1/1 x86: two trivial sparse annotations
arch/x86/kernel/vsmp_64.c:87:14: warning: incorrect type in argument 1 (different address spaces)arch/x86/kernel/vsmp_64.c:87:14: expected void const volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:87:14: got void *[assigned] addressarch/x86/kernel/vsmp_64.c:88:22: warning: incorrect type in argument 1 (different address spaces)arch/x86/kernel/vsmp_64.c:88:22: expected void const volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:88:22: got void *arch/x86/kernel/vsmp_64.c:100:23: warning: incorrect type in argument 2 (different address spaces)arch/x86/kernel/vsmp_64.c:100:23: expected void volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:100:23: got void *arch/x86/kernel/vsmp_64.c:101:23: warning: incorrect type in argument 1 (different address spaces)arch/x86/kernel/vsmp_64.c:101:23: expected void const volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:101:23: got void *arch/x86/mm/gup.c:235:6: warning: incorrect type in argument 1 (different base types)arch/x86/mm/gup.c:235:6: expected void const volatile [noderef] <asn:1>*<noident>arch/x86/mm/gup.c:235:6: got unsigned long [unsigned] [assigned] start
Impact: fewer sparse warnings, no functional changes
--- arch/x86/kernel/vsmp_64.c | 2 +- arch/x86/mm/gup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/vsmp_64.c +1 -1
@@ -78,7 +78,7 @@ static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf,static void __init set_vsmp_pv_ops (void ) { -void *address; +void __iomem *address;unsigned int cap, ctl, cfg;/* set vSMP magic bits to indicate vSMP capable kernel */
arch/x86/mm/gup.c +1 -1
@@ -233,7 +233,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write, len = (unsigned long ) nr_pages <<PAGE_SHIFT ; end = start + len;if (unlikely (!access_ok (write ?VERIFY_WRITE :VERIFY_READ , - start, len))) + (void __user *)start, len))) goto slow_irqon;/*
Signature · 1 line
1.6.0.3.756.gb776d
Ingo Molnar
AppliedQuoted 16 lines · Harvey Harrison
arch/x86/kernel/vsmp_64.c:87:14: warning: incorrect type in argument 1 (different address spaces)arch/x86/kernel/vsmp_64.c:87:14: expected void const volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:87:14: got void *[assigned] addressarch/x86/kernel/vsmp_64.c:88:22: warning: incorrect type in argument 1 (different address spaces)arch/x86/kernel/vsmp_64.c:88:22: expected void const volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:88:22: got void *arch/x86/kernel/vsmp_64.c:100:23: warning: incorrect type in argument 2 (different address spaces)arch/x86/kernel/vsmp_64.c:100:23: expected void volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:100:23: got void *arch/x86/kernel/vsmp_64.c:101:23: warning: incorrect type in argument 1 (different address spaces)arch/x86/kernel/vsmp_64.c:101:23: expected void const volatile [noderef] <asn:2>*addrarch/x86/kernel/vsmp_64.c:101:23: got void *arch/x86/mm/gup.c:235:6: warning: incorrect type in argument 1 (different base types)arch/x86/mm/gup.c:235:6: expected void const volatile [noderef] <asn:1>*<noident>arch/x86/mm/gup.c:235:6: got unsigned long [unsigned] [assigned] start
Quoted 7 lines
Impact: fewer sparse warnings, no functional changes
Signed-off-by Harvey Harrison <[email protected]>--- arch/x86/kernel/vsmp_64.c | 2 +- arch/x86/mm/gup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
applied to tip/x86/urgent, thanks Harvey!
i see you started using the impact-line, nice :) I moved it to the top of the commit, that's where we generally put it. (it acts as a secondary subject line in essence, so sits right next to the first line of the commit)
Ingo