The patch titled
paravirtualization: header and stubs for paravirtualizing critical operations (headers_check fix)
has been added to the -mm tree. Its filename is
paravirtualization-header-and-stubs-for-headers_check-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: paravirtualization: header and stubs for paravirtualizing critical operations (headers_check fix)
From: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
asm/setup.h is exported, so don't refer to asm/paravirt.h since make
check_headers complains.
Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx>
Cc: Chris Wright <chrisw@xxxxxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx>
Cc: Zachary Amsden <zach@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/paravirt.c | 5 +++++
arch/i386/kernel/setup.c | 6 ++++++
include/asm-i386/paravirt.h | 5 -----
include/asm-i386/setup.h | 9 +--------
4 files changed, 12 insertions(+), 13 deletions(-)
diff -puN arch/i386/kernel/paravirt.c~paravirtualization-header-and-stubs-for-headers_check-fix arch/i386/kernel/paravirt.c
--- a/arch/i386/kernel/paravirt.c~paravirtualization-header-and-stubs-for-headers_check-fix
+++ a/arch/i386/kernel/paravirt.c
@@ -87,6 +87,11 @@ static unsigned native_patch(u8 type, u1
return insn_len;
}
+char *memory_setup(void)
+{
+ return paravirt_ops.memory_setup();
+}
+
static fastcall unsigned long native_get_debugreg(int regno)
{
unsigned long val = 0; /* Damn you, gcc! */
diff -puN arch/i386/kernel/setup.c~paravirtualization-header-and-stubs-for-headers_check-fix arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c~paravirtualization-header-and-stubs-for-headers_check-fix
+++ a/arch/i386/kernel/setup.c
@@ -647,6 +647,12 @@ void __init setup_arch(char **cmdline_p)
tsc_init();
}
+/* Overridden in paravirt.c if CONFIG_PARAVIRT */
+char * __attribute__((weak)) memory_setup(void)
+{
+ return machine_specific_memory_setup();
+}
+
static __init int add_pcspkr(void)
{
struct platform_device *pd;
diff -puN include/asm-i386/paravirt.h~paravirtualization-header-and-stubs-for-headers_check-fix include/asm-i386/paravirt.h
--- a/include/asm-i386/paravirt.h~paravirtualization-header-and-stubs-for-headers_check-fix
+++ a/include/asm-i386/paravirt.h
@@ -161,11 +161,6 @@ static inline void load_esp0(struct tss_
}
#define ARCH_SETUP paravirt_ops.arch_setup();
-static inline char *memory_setup(void)
-{
- return paravirt_ops.memory_setup();
-}
-
static inline unsigned long get_wallclock(void)
{
return paravirt_ops.get_wallclock();
diff -puN include/asm-i386/setup.h~paravirtualization-header-and-stubs-for-headers_check-fix include/asm-i386/setup.h
--- a/include/asm-i386/setup.h~paravirtualization-header-and-stubs-for-headers_check-fix
+++ a/include/asm-i386/setup.h
@@ -70,14 +70,7 @@ extern unsigned char boot_params[PARAM_S
struct e820entry;
char * __init machine_specific_memory_setup(void);
-#ifndef CONFIG_PARAVIRT
-static inline char *memory_setup(void)
-{
- return machine_specific_memory_setup();
-}
-#else
-#include <asm/paravirt.h>
-#endif
+char *memory_setup(void);
int __init copy_e820_map(struct e820entry * biosmap, int nr_map);
int __init sanitize_e820_map(struct e820entry * biosmap, char * pnr_map);
_
Patches currently in -mm which might be from rusty@xxxxxxxxxxxxxxx are
prep-for-paravirt-be-careful-about-touching-bios.patch
prep-for-paravirt-be-careful-about-touching-bios-warning-fix.patch
paravirtualization-header-and-stubs-for-fix.patch
paravirtualization-header-and-stubs-for-headers_check-fix.patch
paravirtualization-patch-inline-replacements-for-fix-2.patch
paravirtualization-patch-inline-replacements-for-fix-3.patch
paravirtualization-more-generic-paravirtualization-warning-fix.patch
fix-kunmap_atomics-use-of-kpte_clear_flush.patch
generic-bug-implementation.patch
generic-bug-for-i386.patch
generic-bug-for-x86-64.patch
bug-test-1.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
