diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-05-10 06:15:36 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 12:26:53 -0400 |
commit | 5a18c92aab13aac7917bc87ceefa23da68698be4 (patch) | |
tree | ee03d8c6ee5d695ea4e548680ab09253f5874685 /include | |
parent | 0cfe61e1a72b345073bb7900a7887da8541abc7a (diff) |
Revert "[PATCH] paravirt: Add startup infrastructure for paravirtualization"
This reverts commit c9ccf30d77f04064fe5436027ab9d2230c7cdd94.
Entering the kernel at startup_32 without passing our real mode data in
%esi, and without guaranteeing that physical and virtual addresses are
identity mapped makes head.S impossible to maintain.
The only user of this infrastructure is lguest which is not merged so
nothing we currently support will break by removing this over designed
nightmare, and only the pending lguest patches will be affected. The
pending Xen patches have a different entry point that they use.
We are currently discussing what Xen and lguest need to do to boot the
kernel in a more normal fashion so using startup_32 in this weird manner is
clearly not their long term direction.
So let's remove this code in head.S before it causes brain damage to people
trying to maintain head.S
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Andi Kleen <ak@suse.de>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Cc: Zachary Amsden <zach@vmware.com>
CC: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-i386/paravirt.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-i386/paravirt.h b/include/asm-i386/paravirt.h index bc5c12c13581..d7a0512f88e0 100644 --- a/include/asm-i386/paravirt.h +++ b/include/asm-i386/paravirt.h | |||
@@ -222,11 +222,6 @@ struct paravirt_ops | |||
222 | void (*iret)(void); | 222 | void (*iret)(void); |
223 | }; | 223 | }; |
224 | 224 | ||
225 | /* Mark a paravirt probe function. */ | ||
226 | #define paravirt_probe(fn) \ | ||
227 | static asmlinkage void (*__paravirtprobe_##fn)(void) __attribute_used__ \ | ||
228 | __attribute__((__section__(".paravirtprobe"))) = fn | ||
229 | |||
230 | extern struct paravirt_ops paravirt_ops; | 225 | extern struct paravirt_ops paravirt_ops; |
231 | 226 | ||
232 | #define PARAVIRT_PATCH(x) \ | 227 | #define PARAVIRT_PATCH(x) \ |