On 01/01/14 04:35, Konrad Rzeszutek Wilk wrote: > The revector and copying of the P2M only happens when > !auto-xlat and on 64-bit builds. It is not obvious from > the code, so lets have seperate 32 and 64-bit functions. > > We also invert the check for auto-xlat to make the code > flow simpler. [...] > @@ -1255,8 +1251,19 @@ static void __init xen_pagetable_init(void) > * anything at this stage. */ > xen_cleanhighmap(MODULES_VADDR, roundup(MODULES_VADDR, PUD_SIZE) - 1); > #endif > -skip: > +} > +#else > +static void __init xen_pagetable_p2m_copy(void) > +{ > + /* Nada! */ > +} > #endif > + > +static void __init xen_pagetable_init(void) > +{ > + paging_init(); > + xen_setup_shared_info();
I would prefer #ifdef CONFIG_X86_64 > + xen_pagetable_p2m_copy(); #endif rather than the empty stub function. I think this makes it clearer what is 64-bit specific. > xen_post_allocator_init(); > } > static void xen_write_cr2(unsigned long cr2) David -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/