mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
linux/x86_64: miscellaneous initialization code cleanup
Signed-off-by: Jan Beulich <jbeulich@novell.com>
This commit is contained in:
kfraser@localhost.localdomain committed
1 parent
2d420d93a6
commit
e77ed40f70
2 files changed
+3
-19
No files matched your search
@@ -90,9 +90,6 @@ EXPORT_SYMBOL(HYPERVISOR_shared_info);
|
||||
extern char hypercall_page[PAGE_SIZE];
|
||||
EXPORT_SYMBOL(hypercall_page);
|
||||
|
||||
/* Allows setting of maximum possible memory size */
|
||||
unsigned long xen_override_max_pfn;
|
||||
|
||||
static int xen_panic_event(struct notifier_block *, unsigned long, void *);
|
||||
static struct notifier_block xen_panic_block = {
|
||||
xen_panic_event, NULL, 0 /* try to go last */
|
||||
@@ -717,7 +714,6 @@ void __init setup_arch(char **cmdline_p)
|
||||
/* reserve ebda region */
|
||||
if (ebda_addr)
|
||||
reserve_bootmem_generic(ebda_addr, ebda_size);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
/*
|
||||
@@ -730,6 +726,7 @@ void __init setup_arch(char **cmdline_p)
|
||||
/* Reserve SMP trampoline */
|
||||
reserve_bootmem_generic(SMP_TRAMPOLINE_BASE, PAGE_SIZE);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ACPI_SLEEP
|
||||
/*
|
||||
|
||||
@@ -77,7 +77,7 @@ extern unsigned long start_pfn;
|
||||
(((mfn_to_pfn((addr) >> PAGE_SHIFT)) << PAGE_SHIFT) + \
|
||||
__START_KERNEL_map)))
|
||||
|
||||
static void early_make_page_readonly(void *va, unsigned int feature)
|
||||
static void __meminit early_make_page_readonly(void *va, unsigned int feature)
|
||||
{
|
||||
unsigned long addr, _va = (unsigned long)va;
|
||||
pte_t pte, *ptep;
|
||||
@@ -378,15 +378,6 @@ __set_fixmap_user (enum fixed_addresses idx, unsigned long phys, pgprot_t prot)
|
||||
|
||||
unsigned long __initdata table_start, table_end;
|
||||
|
||||
unsigned long get_machine_pfn(unsigned long addr)
|
||||
{
|
||||
pud_t* pud = pud_offset_k(NULL, addr);
|
||||
pmd_t* pmd = pmd_offset(pud, addr);
|
||||
pte_t *pte = pte_offset_kernel(pmd, addr);
|
||||
|
||||
return pte_mfn(*pte);
|
||||
}
|
||||
|
||||
static __meminit void *alloc_static_page(unsigned long *phys)
|
||||
{
|
||||
unsigned long va = (start_pfn << PAGE_SHIFT) + __START_KERNEL_map;
|
||||
@@ -532,10 +523,6 @@ void __init xen_init_pt(void)
|
||||
{
|
||||
unsigned long addr, *page;
|
||||
|
||||
memset((void *)init_level4_pgt, 0, PAGE_SIZE);
|
||||
memset((void *)level3_kernel_pgt, 0, PAGE_SIZE);
|
||||
memset((void *)level2_kernel_pgt, 0, PAGE_SIZE);
|
||||
|
||||
/* Find the initial pte page that was built for us. */
|
||||
page = (unsigned long *)xen_start_info->pt_base;
|
||||
addr = page[pgd_index(__START_KERNEL_map)];
|
||||
@@ -596,7 +583,7 @@ void __init xen_init_pt(void)
|
||||
mk_kernel_pgd(__pa_symbol(level3_user_pgt)));
|
||||
}
|
||||
|
||||
void __init extend_init_mapping(unsigned long tables_space)
|
||||
static void __init extend_init_mapping(unsigned long tables_space)
|
||||
{
|
||||
unsigned long va = __START_KERNEL_map;
|
||||
unsigned long phys, addr, *pte_page;
|
||||
|
||||