r2652 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series

[maximilian attems]

Author: maks-guest
Date: 2005-03-08 18:35:57 +0100 (Tue, 08 Mar 2005)
New Revision: 2652

Modified:
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
   trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/x86-i486_emu.dpatch
Log:
fix x86-i486_emu.dpatch


Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 17:29:05 UTC (rev 2651)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog	2005-03-08 17:35:57 UTC (rev 2652)
@@ -11,8 +11,8 @@
 
   * Add newer scsi-changer patch (Maximilian Attems)
 
-  * Rework drivers-net-tg3-readd.dpatch, modular-ide-pnp.dpatch 
-    (Maximilian Attems)
+  * Rework drivers-net-tg3-readd.dpatch, modular-ide-pnp.dpatch,
+    x86-i486_emu.dpatch (Maximilian Attems)
 
  -- Sven Luther <luther@debian.org>  Mon,  7 Mar 2005 14:56:32 +0100
 

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-08 17:29:05 UTC (rev 2651)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/TODO	2005-03-08 17:35:57 UTC (rev 2652)
@@ -1,5 +1,3 @@
-# + x86-i486_emu.dpatch				# OK, needs rediff
-
 # + modular-ide.dpatch 				# FAILED
 # + remove-references-to-removed-drivers.dpatch	# FAILED
 # + ia64-generic-no-smp.dpatch			# FAILED

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 17:29:05 UTC (rev 2651)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-1	2005-03-08 17:35:57 UTC (rev 2652)
@@ -48,3 +48,4 @@
 + drivers-add-scsi_changer.dpatch
 + drivers-net-tg3-readd.dpatch
 + modular-ide-pnp.dpatch
++ x86-i486_emu.dpatch

Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/x86-i486_emu.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/x86-i486_emu.dpatch	2005-03-08 17:29:05 UTC (rev 2651)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/x86-i486_emu.dpatch	2005-03-08 17:35:57 UTC (rev 2652)
@@ -12,7 +12,7 @@
 diff -urN kernel-source-2.6.6/arch/i386/Kconfig kernel-source-2.6.6-1/arch/i386/Kconfig
 --- kernel-source-2.6.6/arch/i386/Kconfig	2004-05-10 19:47:45.000000000 +1000
 +++ kernel-source-2.6.6-1/arch/i386/Kconfig	2004-05-10 22:21:08.000000000 +1000
-@@ -330,6 +330,41 @@
+@@ -341,6 +341,41 @@
  	  This is really intended for distributors who need more
  	  generic optimizations.
  
@@ -54,7 +54,7 @@
  endif
  
  #
-@@ -438,6 +473,7 @@
+@@ -454,6 +489,7 @@
  
  config SMP
  	bool "Symmetric multi-processing support"
@@ -65,7 +65,7 @@
 diff -urN kernel-source-2.6.6/arch/i386/kernel/Makefile kernel-source-2.6.6-1/arch/i386/kernel/Makefile
 --- kernel-source-2.6.6/arch/i386/kernel/Makefile	2004-05-10 19:47:45.000000000 +1000
 +++ kernel-source-2.6.6-1/arch/i386/kernel/Makefile	2004-05-10 22:21:08.000000000 +1000
-@@ -28,6 +28,7 @@
+@@ -29,6 +29,7 @@
  obj-$(CONFIG_MODULES)		+= module.o
  obj-y				+= sysenter.o vsyscall.o
  obj-$(CONFIG_ACPI_SRAT) 	+= srat.o
@@ -514,7 +514,7 @@
 diff -urN kernel-source-2.6.6/arch/i386/kernel/entry.S kernel-source-2.6.6-1/arch/i386/kernel/entry.S
 --- kernel-source-2.6.6/arch/i386/kernel/entry.S	2004-05-10 19:47:45.000000000 +1000
 +++ kernel-source-2.6.6-1/arch/i386/kernel/entry.S	2004-05-10 22:21:09.000000000 +1000
-@@ -562,7 +562,11 @@
+@@ -527,7 +527,11 @@
  
  ENTRY(invalid_op)
  	pushl $0