UML - Compilation problem on 2.6.22-rc4
Hello,
I ran into some compilations problems with UML on the 2.6.22-rc4 kernel. The problem turns up because "paravirt.h" is included in a couple of headers in asm-i386 without being protected by a "#ifdef CONFIG_PARAVIRT".
I've attached a patch to fix this (i.e. UML compiles and runs fine for me with these changes). I don't know if this is sufficient for all cases though (most other uses of the #ifdef include a lengthy #else).
Please keep me in CC as I'm not on the mailing list.
-- Arun
include/asm-i386/highmem.h renamed from usr/src/linux-2.6.22-rc4/include/asm-i386/highmem.h +2 -0
@@ -24,7 +24,9 @@#include <linux/threads.h> #include <asm/kmap_types.h> #include <asm/tlbflush.h> +#ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> +#endif /* declarations for highmem.c */ extern unsigned long highstart_pfn, highend_pfn;
include/asm-i386/mmu_context.h renamed from usr/src/linux-2.6.22-rc4/include/asm-i386/mmu_context.h +2 -1
@@ -5,8 +5,9 @@#include <asm/atomic.h> #include <asm/pgalloc.h> #include <asm/tlbflush.h> +#ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> -#ifndef CONFIG_PARAVIRT +#else #include <asm-generic/mm_hooks.h> static inline void paravirt_activate_mm(struct mm_struct *prev,
Quoted 8 lines · Arun Raghavan
Hello,
I ran into some compilations problems with UML on the 2.6.22-rc4 kernel. The problem turns up because "paravirt.h" is included in a couple of headers in asm-i386 without being protected by a "#ifdefCONFIG_PARAVIRT".I've attached a patch to fix this (i.e. UML compiles and runs fine for me with these changes). I don't know if this is sufficient for all cases though (most other uses of the #ifdef include a lengthy #else).
Thanks, I have this fixed by making an asm-um/paravirt.h instead.
Jeff
Signature · 1 line
Work email - jdike at linux dot intel dot com