projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...
[cascardo/linux.git]
/
arch
/
x86
/
xen
/
enlighten.c
diff --git
a/arch/x86/xen/enlighten.c
b/arch/x86/xen/enlighten.c
index
a4e201b
..
7dcd321
100644
(file)
--- a/
arch/x86/xen/enlighten.c
+++ b/
arch/x86/xen/enlighten.c
@@
-812,7
+812,7
@@
static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
/* Early in boot, while setting up the initial pagetable, assume
everything is pinned. */
/* Early in boot, while setting up the initial pagetable, assume
everything is pinned. */
-static __init void xen_alloc_pte_init(struct mm_struct *mm, u
32
pfn)
+static __init void xen_alloc_pte_init(struct mm_struct *mm, u
nsigned long
pfn)
{
#ifdef CONFIG_FLATMEM
BUG_ON(mem_map); /* should only be used early */
{
#ifdef CONFIG_FLATMEM
BUG_ON(mem_map); /* should only be used early */
@@
-822,7
+822,7
@@
static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn)
/* Early release_pte assumes that all pts are pinned, since there's
only init_mm and anything attached to that is pinned. */
/* Early release_pte assumes that all pts are pinned, since there's
only init_mm and anything attached to that is pinned. */
-static void xen_release_pte_init(u
32
pfn)
+static void xen_release_pte_init(u
nsigned long
pfn)
{
make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
}
{
make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
}
@@
-838,7
+838,7
@@
static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
/* This needs to make sure the new pte page is pinned iff its being
attached to a pinned pagetable. */
/* This needs to make sure the new pte page is pinned iff its being
attached to a pinned pagetable. */
-static void xen_alloc_ptpage(struct mm_struct *mm, u
32
pfn, unsigned level)
+static void xen_alloc_ptpage(struct mm_struct *mm, u
nsigned long
pfn, unsigned level)
{
struct page *page = pfn_to_page(pfn);
{
struct page *page = pfn_to_page(pfn);
@@
-856,12
+856,12
@@
static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)
}
}
}
}
-static void xen_alloc_pte(struct mm_struct *mm, u
32
pfn)
+static void xen_alloc_pte(struct mm_struct *mm, u
nsigned long
pfn)
{
xen_alloc_ptpage(mm, pfn, PT_PTE);
}
{
xen_alloc_ptpage(mm, pfn, PT_PTE);
}
-static void xen_alloc_pmd(struct mm_struct *mm, u
32
pfn)
+static void xen_alloc_pmd(struct mm_struct *mm, u
nsigned long
pfn)
{
xen_alloc_ptpage(mm, pfn, PT_PMD);
}
{
xen_alloc_ptpage(mm, pfn, PT_PMD);
}
@@
-909,7
+909,7
@@
static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd)
}
/* This should never happen until we're OK to use struct page */
}
/* This should never happen until we're OK to use struct page */
-static void xen_release_ptpage(u
32
pfn, unsigned level)
+static void xen_release_ptpage(u
nsigned long
pfn, unsigned level)
{
struct page *page = pfn_to_page(pfn);
{
struct page *page = pfn_to_page(pfn);
@@
-923,23
+923,23
@@
static void xen_release_ptpage(u32 pfn, unsigned level)
}
}
}
}
-static void xen_release_pte(u
32
pfn)
+static void xen_release_pte(u
nsigned long
pfn)
{
xen_release_ptpage(pfn, PT_PTE);
}
{
xen_release_ptpage(pfn, PT_PTE);
}
-static void xen_release_pmd(u
32
pfn)
+static void xen_release_pmd(u
nsigned long
pfn)
{
xen_release_ptpage(pfn, PT_PMD);
}
#if PAGETABLE_LEVELS == 4
{
xen_release_ptpage(pfn, PT_PMD);
}
#if PAGETABLE_LEVELS == 4
-static void xen_alloc_pud(struct mm_struct *mm, u
32
pfn)
+static void xen_alloc_pud(struct mm_struct *mm, u
nsigned long
pfn)
{
xen_alloc_ptpage(mm, pfn, PT_PUD);
}
{
xen_alloc_ptpage(mm, pfn, PT_PUD);
}
-static void xen_release_pud(u
32
pfn)
+static void xen_release_pud(u
nsigned long
pfn)
{
xen_release_ptpage(pfn, PT_PUD);
}
{
xen_release_ptpage(pfn, PT_PUD);
}