diff options
| author | Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> | 2009-07-30 17:35:33 +0530 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-08-13 10:26:11 +1000 |
| commit | 5d00538b6b445caf8bb9968c88aea0485e3d7d8c (patch) | |
| tree | 577a5913a5eeed1115b20ee3e063943695432680 /drivers/lguest | |
| parent | a13c4670c5be53bb672a548ec0d09c319218090a (diff) | |
next-20090730 lguest build breaks with pfn_pmd()
Hi Rusty,
next-20090729 allmodconfig build breaks at
drivers/lguest/page_tables.c: In function 'setup_pagetables':
drivers/lguest/page_tables.c:987: error: incompatible type for argument 2 of 'pfn_pmd'
drivers/lguest/page_tables.c:994: error: expected ';' before ')' token
drivers/lguest/page_tables.c:994: error: expected statement before ')' token
make[2]: *** [drivers/lguest/page_tables.o] Error 1
build failure is introduced by commit e07dd6220a4bf81a2549e7e37523a2557547d9d7
I have tested the patch for the build failure only.
Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
--
drivers/lguest/page_tables.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/lguest')
| -rw-r--r-- | drivers/lguest/page_tables.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index 70b07830d9b2..232fba6a4882 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c @@ -984,14 +984,14 @@ static unsigned long setup_pagetables(struct lguest *lg, for (i = j = 0; i < mapped_pages && j < PTRS_PER_PMD; i += PTRS_PER_PTE, j++) { pmd = pfn_pmd(((unsigned long)&linear[i] - mem_base)/PAGE_SIZE, - _PAGE_PRESENT | _PAGE_RW | _PAGE_USER); + __pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER)); if (copy_to_user(&pmds[j], &pmd, sizeof(pmd)) != 0) return -EFAULT; } /* One PGD entry, pointing to that PMD page. */ - pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT)); + pgd = __pgd(((unsigned long)pmds - mem_base) | _PAGE_PRESENT); /* Copy it in as the first PGD entry (ie. addresses 0-1G). */ if (copy_to_user(&pgdir[0], &pgd, sizeof(pgd)) != 0) return -EFAULT; |