[Xbox-linux-cvs] kernel-2.6/arch/i386 Kconfig, 1.29, 1.30 Makefile, 1.20, 1.21

[Laurence L. <la...@us...>]

Update of /cvsroot/xbox-linux/kernel-2.6/arch/i386
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5988/arch/i386

Modified Files:
	Kconfig Makefile 
Log Message:
Merge 2.6.21

Index: Makefile
===================================================================
RCS file: /cvsroot/xbox-linux/kernel-2.6/arch/i386/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile	11 Jun 2007 05:08:52 -0000	1.20
+++ Makefile	11 Jun 2007 05:10:00 -0000	1.21
@@ -29,7 +29,7 @@
 LDFLAGS_vmlinux :=
 CHECKFLAGS	+= -D__i386__
 
-CFLAGS += -pipe -mregparm=3
+CFLAGS += -pipe -mregparm=3 -freg-struct-return
 
 # prevent gcc from keeping the stack 16 byte aligned
 CFLAGS += $(call cc-option,-mpreferred-stack-boundary=2)

Index: Kconfig
===================================================================
RCS file: /cvsroot/xbox-linux/kernel-2.6/arch/i386/Kconfig,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- Kconfig	11 Jun 2007 05:08:52 -0000	1.29
+++ Kconfig	11 Jun 2007 05:10:00 -0000	1.30
@@ -18,6 +18,19 @@
 	bool
 	default y
 
+config CLOCKSOURCE_WATCHDOG
+	bool
+	default y
+
+config GENERIC_CLOCKEVENTS
+	bool
+	default y
+
+config GENERIC_CLOCKEVENTS_BROADCAST
+	bool
+	default y
+	depends on X86_LOCAL_APIC
+
 config LOCKDEP_SUPPORT
 	bool
 	default y
@@ -38,6 +51,10 @@
 	bool
 	default y
 
+config ZONE_DMA
+	bool
+	default y
+
 config SBUS
 	bool
 
@@ -70,6 +87,8 @@
 
 menu "Processor type and features"
 
+source "kernel/time/Kconfig"
+
 config SMP
 	bool "Symmetric multi-processing support"
 	---help---
@@ -208,6 +227,15 @@
 	  However, when run without a hypervisor the kernel is
 	  theoretically slower.  If in doubt, say N.
 
+config VMI
+	bool "VMI Paravirt-ops support"
+	depends on PARAVIRT && !COMPAT_VDSO
+	help
+	  VMI provides a paravirtualized interface to the VMware ESX server
+	  (it could be used by other hypervisors in theory too, but is not
+	  at the moment), by linking the kernel to a GPL-ed ROM module
+	  provided by the hypervisor.
+
 config ACPI_SRAT
 	bool
 	default y
@@ -874,7 +902,6 @@
 config COMPAT_VDSO
 	bool "Compat VDSO support"
 	default y
-	depends on !PARAVIRT
 	help
 	  Map the VDSO to the predictable old-style address too.
 	---help---