Some tidbits to make Xen (-unstable) compile with the latest
2.6 snapshot. No need for you to duplicate the work I already
did.
Signed-off-by: Rik van Riel <riel@redhat.com>
--- linux-2.6.10/arch/xen/i386/kernel/i386_ksyms.c.bk7 2005-01-06
17:30:48.000000000 -0500
+++ linux-2.6.10/arch/xen/i386/kernel/i386_ksyms.c 2005-01-06 20:54:39.000000000
-0500
@@ -61,7 +61,6 @@
/* platform dependent support */
EXPORT_SYMBOL(boot_cpu_data);
-EXPORT_SYMBOL(MCA_bus);
#ifdef CONFIG_DISCONTIGMEM
EXPORT_SYMBOL(node_data);
EXPORT_SYMBOL(physnode_map);
--- linux-2.6.10/kernel/sysctl.c.bk7 2005-01-06 20:58:23.000000000 -0500
+++ linux-2.6.10/kernel/sysctl.c 2005-01-06 21:28:43.000000000 -0500
@@ -681,7 +681,7 @@
.proc_handler = &proc_unknown_nmi_panic,
},
#endif
-#if defined(CONFIG_X86)
+#if defined(CONFIG_X86) && !defined(CONFIG_XEN)
{
.ctl_name = KERN_BOOTLOADER_TYPE,
.procname = "bootloader_type",
--- linux-2.6.10/arch/xen/i386/Kconfig.bk9 2005-01-06 23:06:54.951408156 -0500
+++ linux-2.6.10/arch/xen/i386/Kconfig 2005-01-06 23:07:28.100022898 -0500
@@ -253,6 +253,10 @@
depends on !M386
default y
+config GENERIC_CALIBRATE_DELAY
+ bool
+ default y
+
config X86_PPRO_FENCE
bool
depends on M686 || M586MMX || M586TSC || M586 || M486 || M386
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It''s fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xen-devel
