Prev: [PATCH 0/7][v4] PV extension of HVM (Hybrid) for Xen
Next: kconfig: place git SHA1 in .config output if in git tree
From: Jeremy Fitzhardinge on 1 Mar 2010 20:10
On 03/01/2010 01:38 AM, Sheng Yang wrote:
> xen_guest_init() would setup the environment.
>
> Cc: Ingo Molnar<mingo(a)elte.hu>
> Signed-off-by: Sheng Yang<sheng(a)linux.intel.com>
> ---
> arch/x86/kernel/setup.c | 8 ++++++++
> 1 files changed, 8 insertions(+), 0 deletions(-)
>
> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
> index 5d9e40c..2b61d46 100644
> --- a/arch/x86/kernel/setup.c
> +++ b/arch/x86/kernel/setup.c
> @@ -113,6 +113,10 @@
> #endif
> #include<asm/mce.h>
>
> +#ifdef CONFIG_XEN
> +#include<xen/xen.h>
> +#endif
>

No #ifdefs; put them in xen.h if necessary (which they aren't). This
probably isn't the right header anyway; this is specifically for testing
the presence of Xen and/or the current domain type. It shouldn't have
any other prototypes in it, or include anything else (it probably
already includes too much). Given this is already x86-specific code,
include asm/xen/something.h.

> +
> /*
> * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
> * The direct mapping extends to max_pfn_mapped, so that we can directly access
> @@ -740,6 +744,10 @@ void __init setup_arch(char **cmdline_p)
>
> x86_init.oem.arch_setup();
>
> +#ifdef CONFIG_XEN
> + xen_guest_init();
> +#endif
>

Again, no #ifdefs here. Put an #ifdeffed stub in an appropriate header.

J
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 0/7][v4] PV extension of HVM (Hybrid) for Xen
Next: kconfig: place git SHA1 in .config output if in git tree