Commit e53fb04f authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar

x86: unify kernel_physical_mapping_init() function signatures

Impact: cleanup

In preparation for moving the function declaration to a header file,
unify 32-bit and 64-bit signatures.
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <1236257708-27269-16-git-send-email-penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 298af9d8
...@@ -11,17 +11,12 @@ ...@@ -11,17 +11,12 @@
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
extern void __init early_ioremap_page_table_range_init(void); extern void __init early_ioremap_page_table_range_init(void);
extern void __init kernel_physical_mapping_init(unsigned long start_pfn,
unsigned long end_pfn,
int use_pse);
#endif #endif
#ifdef CONFIG_X86_64 extern unsigned long __init
extern unsigned long __meminit
kernel_physical_mapping_init(unsigned long start, kernel_physical_mapping_init(unsigned long start,
unsigned long end, unsigned long end,
unsigned long page_size_mask); unsigned long page_size_mask);
#endif
unsigned long __initdata e820_table_start; unsigned long __initdata e820_table_start;
unsigned long __meminitdata e820_table_end; unsigned long __meminitdata e820_table_end;
...@@ -301,10 +296,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, ...@@ -301,10 +296,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start,
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
for (i = 0; i < nr_range; i++) for (i = 0; i < nr_range; i++)
kernel_physical_mapping_init( kernel_physical_mapping_init(mr[i].start, mr[i].end,
mr[i].start >> PAGE_SHIFT, mr[i].page_size_mask);
mr[i].end >> PAGE_SHIFT,
mr[i].page_size_mask == (1<<PG_LEVEL_2M));
ret = end; ret = end;
#else /* CONFIG_X86_64 */ #else /* CONFIG_X86_64 */
for (i = 0; i < nr_range; i++) for (i = 0; i < nr_range; i++)
......
...@@ -223,10 +223,13 @@ static inline int is_kernel_text(unsigned long addr) ...@@ -223,10 +223,13 @@ static inline int is_kernel_text(unsigned long addr)
* of max_low_pfn pages, by creating page tables starting from address * of max_low_pfn pages, by creating page tables starting from address
* PAGE_OFFSET: * PAGE_OFFSET:
*/ */
void __init kernel_physical_mapping_init(unsigned long start_pfn, unsigned long __init
unsigned long end_pfn, kernel_physical_mapping_init(unsigned long start,
int use_pse) unsigned long end,
unsigned long page_size_mask)
{ {
int use_pse = page_size_mask == (1<<PG_LEVEL_2M);
unsigned long start_pfn, end_pfn;
pgd_t *pgd_base = swapper_pg_dir; pgd_t *pgd_base = swapper_pg_dir;
int pgd_idx, pmd_idx, pte_ofs; int pgd_idx, pmd_idx, pte_ofs;
unsigned long pfn; unsigned long pfn;
...@@ -236,6 +239,9 @@ void __init kernel_physical_mapping_init(unsigned long start_pfn, ...@@ -236,6 +239,9 @@ void __init kernel_physical_mapping_init(unsigned long start_pfn,
unsigned pages_2m, pages_4k; unsigned pages_2m, pages_4k;
int mapping_iter; int mapping_iter;
start_pfn = start >> PAGE_SHIFT;
end_pfn = end >> PAGE_SHIFT;
/* /*
* First iteration will setup identity mapping using large/small pages * First iteration will setup identity mapping using large/small pages
* based on use_pse, with other attributes same as set by * based on use_pse, with other attributes same as set by
...@@ -350,6 +356,7 @@ repeat: ...@@ -350,6 +356,7 @@ repeat:
mapping_iter = 2; mapping_iter = 2;
goto repeat; goto repeat;
} }
return 0;
} }
pte_t *kmap_pte; pte_t *kmap_pte;
......
...@@ -539,7 +539,7 @@ phys_pud_update(pgd_t *pgd, unsigned long addr, unsigned long end, ...@@ -539,7 +539,7 @@ phys_pud_update(pgd_t *pgd, unsigned long addr, unsigned long end,
return phys_pud_init(pud, addr, end, page_size_mask); return phys_pud_init(pud, addr, end, page_size_mask);
} }
unsigned long __meminit unsigned long __init
kernel_physical_mapping_init(unsigned long start, kernel_physical_mapping_init(unsigned long start,
unsigned long end, unsigned long end,
unsigned long page_size_mask) unsigned long page_size_mask)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment