diff options
Diffstat (limited to 'arch/x86/xen/enlighten.c')
-rw-r--r-- | arch/x86/xen/enlighten.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 7b3508952b9c..a27d562a9744 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -844,7 +844,7 @@ static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) | |||
844 | 844 | ||
845 | /* Early in boot, while setting up the initial pagetable, assume | 845 | /* Early in boot, while setting up the initial pagetable, assume |
846 | everything is pinned. */ | 846 | everything is pinned. */ |
847 | static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn) | 847 | static __init void xen_alloc_pte_init(struct mm_struct *mm, unsigned long pfn) |
848 | { | 848 | { |
849 | #ifdef CONFIG_FLATMEM | 849 | #ifdef CONFIG_FLATMEM |
850 | BUG_ON(mem_map); /* should only be used early */ | 850 | BUG_ON(mem_map); /* should only be used early */ |
@@ -854,7 +854,7 @@ static __init void xen_alloc_pte_init(struct mm_struct *mm, u32 pfn) | |||
854 | 854 | ||
855 | /* Early release_pte assumes that all pts are pinned, since there's | 855 | /* Early release_pte assumes that all pts are pinned, since there's |
856 | only init_mm and anything attached to that is pinned. */ | 856 | only init_mm and anything attached to that is pinned. */ |
857 | static void xen_release_pte_init(u32 pfn) | 857 | static void xen_release_pte_init(unsigned long pfn) |
858 | { | 858 | { |
859 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); | 859 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); |
860 | } | 860 | } |
@@ -870,7 +870,7 @@ static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn) | |||
870 | 870 | ||
871 | /* This needs to make sure the new pte page is pinned iff its being | 871 | /* This needs to make sure the new pte page is pinned iff its being |
872 | attached to a pinned pagetable. */ | 872 | attached to a pinned pagetable. */ |
873 | static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level) | 873 | static void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn, unsigned level) |
874 | { | 874 | { |
875 | struct page *page = pfn_to_page(pfn); | 875 | struct page *page = pfn_to_page(pfn); |
876 | 876 | ||
@@ -888,12 +888,12 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level) | |||
888 | } | 888 | } |
889 | } | 889 | } |
890 | 890 | ||
891 | static void xen_alloc_pte(struct mm_struct *mm, u32 pfn) | 891 | static void xen_alloc_pte(struct mm_struct *mm, unsigned long pfn) |
892 | { | 892 | { |
893 | xen_alloc_ptpage(mm, pfn, PT_PTE); | 893 | xen_alloc_ptpage(mm, pfn, PT_PTE); |
894 | } | 894 | } |
895 | 895 | ||
896 | static void xen_alloc_pmd(struct mm_struct *mm, u32 pfn) | 896 | static void xen_alloc_pmd(struct mm_struct *mm, unsigned long pfn) |
897 | { | 897 | { |
898 | xen_alloc_ptpage(mm, pfn, PT_PMD); | 898 | xen_alloc_ptpage(mm, pfn, PT_PMD); |
899 | } | 899 | } |
@@ -941,7 +941,7 @@ static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd) | |||
941 | } | 941 | } |
942 | 942 | ||
943 | /* This should never happen until we're OK to use struct page */ | 943 | /* This should never happen until we're OK to use struct page */ |
944 | static void xen_release_ptpage(u32 pfn, unsigned level) | 944 | static void xen_release_ptpage(unsigned long pfn, unsigned level) |
945 | { | 945 | { |
946 | struct page *page = pfn_to_page(pfn); | 946 | struct page *page = pfn_to_page(pfn); |
947 | 947 | ||
@@ -955,23 +955,23 @@ static void xen_release_ptpage(u32 pfn, unsigned level) | |||
955 | } | 955 | } |
956 | } | 956 | } |
957 | 957 | ||
958 | static void xen_release_pte(u32 pfn) | 958 | static void xen_release_pte(unsigned long pfn) |
959 | { | 959 | { |
960 | xen_release_ptpage(pfn, PT_PTE); | 960 | xen_release_ptpage(pfn, PT_PTE); |
961 | } | 961 | } |
962 | 962 | ||
963 | static void xen_release_pmd(u32 pfn) | 963 | static void xen_release_pmd(unsigned long pfn) |
964 | { | 964 | { |
965 | xen_release_ptpage(pfn, PT_PMD); | 965 | xen_release_ptpage(pfn, PT_PMD); |
966 | } | 966 | } |
967 | 967 | ||
968 | #if PAGETABLE_LEVELS == 4 | 968 | #if PAGETABLE_LEVELS == 4 |
969 | static void xen_alloc_pud(struct mm_struct *mm, u32 pfn) | 969 | static void xen_alloc_pud(struct mm_struct *mm, unsigned long pfn) |
970 | { | 970 | { |
971 | xen_alloc_ptpage(mm, pfn, PT_PUD); | 971 | xen_alloc_ptpage(mm, pfn, PT_PUD); |
972 | } | 972 | } |
973 | 973 | ||
974 | static void xen_release_pud(u32 pfn) | 974 | static void xen_release_pud(unsigned long pfn) |
975 | { | 975 | { |
976 | xen_release_ptpage(pfn, PT_PUD); | 976 | xen_release_ptpage(pfn, PT_PUD); |
977 | } | 977 | } |