Messages in this thread | | | From | Mariusz Kozlowski <> | Subject | Re: 2.6.19-rc5-mm2 | Date | Tue, 14 Nov 2006 20:23:53 +0100 |
| |
> hm, but that breaks x86. Maybe this.. > > > arch/i386/kernel/alternative.c | 5 ----- > include/asm-i386/alternative.h | 4 ++++ > include/asm-x86_64/alternative.h | 4 ++++ > 3 files changed, 8 insertions(+), 5 deletions(-) > > diff -puN > arch/i386/kernel/alternative.c~fix-x86_64-mm-patch-inline-replacements-for > arch/i386/kernel/alternative.c --- > a/arch/i386/kernel/alternative.c~fix-x86_64-mm-patch-inline-replacements-fo >r +++ a/arch/i386/kernel/alternative.c > @@ -380,11 +380,6 @@ void apply_paravirt(struct paravirt_patc > } > extern struct paravirt_patch __start_parainstructions[], > __stop_parainstructions[]; > -#else > -void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch > *end) -{ > -} > -extern struct paravirt_patch *__start_parainstructions, > *__stop_parainstructions; #endif /* CONFIG_PARAVIRT */ > > void __init alternative_instructions(void) > diff -puN > include/asm-i386/alternative.h~fix-x86_64-mm-patch-inline-replacements-for > include/asm-i386/alternative.h --- > a/include/asm-i386/alternative.h~fix-x86_64-mm-patch-inline-replacements-fo >r +++ a/include/asm-i386/alternative.h > @@ -119,6 +119,10 @@ static inline void alternatives_smp_swit > #endif > > struct paravirt_patch; > +#ifdef CONFIG_PARAVIRT > void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch > *end); +#else > +#define apply_paravirt(start, end) do { } while (0) > +#endif > > #endif /* _I386_ALTERNATIVE_H */ > diff -puN > include/asm-x86_64/alternative.h~fix-x86_64-mm-patch-inline-replacements-fo >r include/asm-x86_64/alternative.h --- > a/include/asm-x86_64/alternative.h~fix-x86_64-mm-patch-inline-replacements- >for +++ a/include/asm-x86_64/alternative.h > @@ -134,6 +134,10 @@ static inline void alternatives_smp_swit > #endif > > struct paravirt_patch; > +#ifdef CONFIG_PARAVIRT > void apply_paravirt(struct paravirt_patch *start, struct paravirt_patch > *end); +#else > +#define apply_paravirt(start, end) do { } while (0) > +#endif > > #endif /* _X86_64_ALTERNATIVE_H */ > _ > > > Unpleasant duplication there. Perhaps we should have linux/alternative.h
Thanks. It compiled fine with this patch.
-- Regards,
Mariusz Kozlowski - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |