[kernel] r12335 - in people/waldi/xen-extra/linux-2.6.18-xen-3/debian: . patches-update/features/all/xen patches-update/series

[Bastian Blank]

Author: waldi
Date: Fri Oct 17 15:37:23 2008
New Revision: 12335

Log:
* debian/changelog: Update.
* debian/patches-update/series/1-extra: Add new patch.
* debian/patches-update/features/all/xen/remove-4gb-warning.patch: Add.
* debian/patches-update/features/all/xen/xen-4gb-fixup.patch: Remove.


Added:
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/features/all/xen/remove-4gb-warning.patch
Removed:
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/features/all/xen/xen-4gb-fixup.patch
Modified:
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog
   people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/changelog	Fri Oct 17 15:37:23 2008
@@ -2,6 +2,7 @@
 
   * Update Xen patch to 3.1 branch, 3.1.1 release.
   * Allow overtaking of hvc for the console.
+  * Remove 4gb segments warning completely.
 
  -- Bastian Blank <waldi at debian.org>  Fri, 17 Oct 2008 15:12:44 +0200
 

Added: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/features/all/xen/remove-4gb-warning.patch
==============================================================================
--- (empty file)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/features/all/xen/remove-4gb-warning.patch	Fri Oct 17 15:37:23 2008
@@ -0,0 +1,33 @@
+--- a/arch/i386/kernel/Makefile
++++ b/arch/i386/kernel/Makefile
+@@ -94,1 +94,0 @@
+-obj-y += fixup.o
+--- a/arch/i386/kernel/entry-xen.S
++++ b/arch/i386/kernel/entry-xen.S
+@@ -1205,7 +1205,0 @@
+-ENTRY(fixup_4gb_segment)
+-	RING0_EC_FRAME
+-	pushl $do_fixup_4gb_segment
+-	CFI_ADJUST_CFA_OFFSET 4
+-	jmp error_code
+-	CFI_ENDPROC
+-
+--- a/arch/i386/kernel/traps-xen.c
++++ b/arch/i386/kernel/traps-xen.c
+@@ -101,8 +101,6 @@ asmlinkage void simd_coprocessor_error(void);
+ asmlinkage void alignment_check(void);
+ #ifndef CONFIG_XEN
+ asmlinkage void spurious_interrupt_bug(void);
+-#else
+-asmlinkage void fixup_4gb_segment(void);
+ #endif
+ asmlinkage void machine_check(void);
+ 
+@@ -1172,7 +1170,6 @@ static const trap_info_t __cpuinitconst trap_table[] = {
+ 	{ 12, 0, __KERNEL_CS, (unsigned long)stack_segment		},
+ 	{ 13, 0, __KERNEL_CS, (unsigned long)general_protection		},
+ 	{ 14, 0|4, __KERNEL_CS, (unsigned long)page_fault		},
+-	{ 15, 0, __KERNEL_CS, (unsigned long)fixup_4gb_segment		},
+ 	{ 16, 0, __KERNEL_CS, (unsigned long)coprocessor_error		},
+ 	{ 17, 0, __KERNEL_CS, (unsigned long)alignment_check		},
+ #ifdef CONFIG_X86_MCE

Modified: people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra
==============================================================================
--- people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra	(original)
+++ people/waldi/xen-extra/linux-2.6.18-xen-3/debian/patches-update/series/1-extra	Fri Oct 17 15:37:23 2008
@@ -5,6 +5,6 @@
 + ../patches-base/features/all/vserver/bindmount-dev.patch featureset=xen-vserver
 + features/all/xen/vserver-clash.patch featureset=xen-vserver
 + features/all/xen/xen-3.1-15467.patch
++ features/all/xen/remove-4gb-warning.patch arch=i386
 + features/all/xen/console-hvc-overtake.patch
-+ features/all/xen/xen-4gb-fixup.patch
 + features/all/xen/vserver-update.patch featureset=xen-vserver