[kernel] r12409 - in dists/etch/linux-2.6/debian: . patches/features/all/xen patches/series

[Bastian Blank]

Author: waldi
Date: Sun Nov 23 10:45:32 2008
New Revision: 12409

Log:
[xen] Remove 4gb segments warning completely.

* debian/changelog: Update.
* debian/patches/features/all/xen/remove-4gb-warning.patch: Add.
* debian/patches/series/24-extra: Add new patch


Added:
   dists/etch/linux-2.6/debian/patches/features/all/xen/remove-4gb-warning.patch
Modified:
   dists/etch/linux-2.6/debian/changelog
   dists/etch/linux-2.6/debian/patches/series/24-extra

Modified: dists/etch/linux-2.6/debian/changelog
==============================================================================
--- dists/etch/linux-2.6/debian/changelog	(original)
+++ dists/etch/linux-2.6/debian/changelog	Sun Nov 23 10:45:32 2008
@@ -10,6 +10,9 @@
   * xen: Add softlockup-no-idle-hz.patch to prevent softlockup in xen guest.
     (closes: #506418)
 
+  [ Bastian Blank ]
+  * [xen] Remove 4gb segments warning completely. (closes: 506420)
+
  -- dann frazier <dannf at debian.org>  Fri, 17 Oct 2008 14:54:31 -0600
 
 linux-2.6 (2.6.18.dfsg.1-23) stable; urgency=high

Added: dists/etch/linux-2.6/debian/patches/features/all/xen/remove-4gb-warning.patch
==============================================================================
--- (empty file)
+++ dists/etch/linux-2.6/debian/patches/features/all/xen/remove-4gb-warning.patch	Sun Nov 23 10:45:32 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_INT_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: dists/etch/linux-2.6/debian/patches/series/24-extra
==============================================================================
--- dists/etch/linux-2.6/debian/patches/series/24-extra	(original)
+++ dists/etch/linux-2.6/debian/patches/series/24-extra	Sun Nov 23 10:45:32 2008
@@ -1 +1,2 @@
 + features/all/xen/softlockup-no-idle-hz.patch *_xen *_xen-vserver
++ features/all/xen/remove-4gb-warning.patch *_xen *_xen-vserver