From 03fc59cd523bd35f130e1f2ccd7cd084b62294e8 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Tue, 28 Oct 2008 23:05:22 -0700 Subject: [PATCH] --- yaml --- r: 118200 b: refs/heads/master c: 9352f5698db2c6d7f2789f6cd37e3996d49ac4b5 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vsmp_64.c | 2 +- trunk/arch/x86/mm/gup.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3774e0c6193f..ca54a4a855c2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f96f57d91c2df75011d1e260c23edca429f37361 +refs/heads/master: 9352f5698db2c6d7f2789f6cd37e3996d49ac4b5 diff --git a/trunk/arch/x86/kernel/vsmp_64.c b/trunk/arch/x86/kernel/vsmp_64.c index 7766d36983fc..a688f3bfaec2 100644 --- a/trunk/arch/x86/kernel/vsmp_64.c +++ b/trunk/arch/x86/kernel/vsmp_64.c @@ -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 */ diff --git a/trunk/arch/x86/mm/gup.c b/trunk/arch/x86/mm/gup.c index 4ba373c5b8c8..be54176e9eb2 100644 --- a/trunk/arch/x86/mm/gup.c +++ b/trunk/arch/x86/mm/gup.c @@ -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; /*