[PATCH] for linux-2.6-merge.hg

[PATCH] for linux-2.6-merge.hg

[Tobias Hunger]

[-- Attachment #1.1.1: Type: text/plain, Size: 542 bytes --]

Hi!

Attached you will find two trivial exports from my hg repository. Both are 
needed to build a kernel that comes close to the standard ubuntu one.

The first adds #include <linux/sched.h> to 
include/asm-i386/mach-xen/asm/pgtable-2level.h. Without that the definition 
of mm_init is missing there.

The second stops MCA support from getting enabled when Xen is enabled. IIRC 
MCA is not supported by Xen (please correct me if I am wrong) and some 
drivers needing that fail to build without this fix.

Best Regards,
Tobias

[-- Attachment #1.1.2: sched.hgexport --]
[-- Type: text/x-diff, Size: 647 bytes --]

# HG changeset patch
# User tobias@aquazul.com
# Node ID 14171b0776faa0bcd9c382c8de832a7064b3859f
# Parent  a706089c0b016177734ad30ee7da3c572f13b88e
Include sched.h for mm_init.

diff -r a706089c0b01 -r 14171b0776fa include/asm-i386/mach-xen/asm/pgtable-2level.h
--- a/include/asm-i386/mach-xen/asm/pgtable-2level.h	Fri Dec  9 03:52:24 2005
+++ b/include/asm-i386/mach-xen/asm/pgtable-2level.h	Fri Dec  9 10:21:44 2005
@@ -2,6 +2,7 @@
 #define _I386_PGTABLE_2LEVEL_H
 
 #include <asm-generic/pgtable-nopmd.h>
+#include <linux/sched.h>
 
 #define pte_ERROR(e) \
 	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, (e).pte_low)

[-- Attachment #1.1.3: disable-mca.hgexport --]
[-- Type: text/x-diff, Size: 625 bytes --]

# HG changeset patch
# User tobias@aquazul.com
# Node ID ec2325c90360430c87d1681fe2cb8311d529f232
# Parent  14171b0776faa0bcd9c382c8de832a7064b3859f
Disable MCA for Xen.

diff -r 14171b0776fa -r ec2325c90360 arch/i386/Kconfig
--- a/arch/i386/Kconfig	Fri Dec  9 10:21:44 2005
+++ b/arch/i386/Kconfig	Fri Dec  9 10:22:28 2005
@@ -990,7 +990,7 @@
 source "drivers/eisa/Kconfig"
 
 config MCA
-	bool "MCA support" if !(X86_VISWS || X86_VOYAGER)
+	bool "MCA support" if !(X86_VISWS || X86_VOYAGER || X86_XEN)
 	default y if X86_VOYAGER
 	help
 	  MicroChannel Architecture is found in some IBM PS/2 machines and

[-- Attachment #1.2: Type: application/pgp-signature, Size: 189 bytes --]

[-- Attachment #2: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

Re: [PATCH] for linux-2.6-merge.hg

[Stephen Tweedie]

Hi,

On Fri, 2005-12-09 at 11:31 +0100, Tobias Hunger wrote:

> Attached you will find two trivial exports from my hg repository. Both are 
> needed to build a kernel that comes close to the standard ubuntu one.
> 
> The first adds #include <linux/sched.h> to 
> include/asm-i386/mach-xen/asm/pgtable-2level.h. Without that the definition 
> of mm_init is missing there.

Yes, I posted a patch for that here on Monday.  That version also
includes the same fix for pgtable-3level.h; it needs fixed too, else PAE
remains broken.

--Stephen

Re: [PATCH] for linux-2.6-merge.hg

[Vincent Hanquez]

On Fri, Dec 09, 2005 at 10:22:37AM -0500, Stephen Tweedie wrote:
> Yes, I posted a patch for that here on Monday.  That version also
> includes the same fix for pgtable-3level.h; it needs fixed too, else PAE
> remains broken.

This is in the pipeline now.

Thanks,
-- 
Vincent Hanquez