diff --git a/architecture/powerpc/kernel26-disable.lst b/architecture/powerpc/kernel26-disable.lst index 68c46471b..7971c2c03 100644 --- a/architecture/powerpc/kernel26-disable.lst +++ b/architecture/powerpc/kernel26-disable.lst @@ -9,3 +9,5 @@ CONFIG_SCSI_AHA1542 2003-12-22 2.6.0 CONFIG_MAC_SERIAL 2004-03-20 2.6.3 # suspend unfunctional CONFIG_SERIAL_PMACZILOG 2004-03-20 2.6.3 # suspend unfunctional CONFIG_PREEMPT 2004-06-06 2.6.7 +CONFIG_SND_INTERWAVE 2004-06-17 2.6.7 # isapnp not avail +CONFIG_SND_INTERWAVE_STB 2004-06-17 2.6.7 # isapnp not avail diff --git a/package/base/linux26-header/linux26-header.desc b/package/base/linux26-header/linux26-header.desc index b58221fd0..abfd50337 100644 --- a/package/base/linux26-header/linux26-header.desc +++ b/package/base/linux26-header/linux26-header.desc @@ -40,6 +40,6 @@ [L] GPL [S] Stable -[V] 2.6.6 +[V] 2.6.7 [P] O 01-------9 100.300 diff --git a/package/base/linux26-src/linux26-src.desc b/package/base/linux26-src/linux26-src.desc index 9fe77363a..deab35daa 100644 --- a/package/base/linux26-src/linux26-src.desc +++ b/package/base/linux26-src/linux26-src.desc @@ -39,6 +39,6 @@ [L] GPL [S] Stable -[V] 2.6.6 +[V] 2.6.7 [P] X -1-------9 100.900 diff --git a/package/base/linux26/99-hotfix-i386-x86_64-fpu-state.patch b/package/base/linux26/99-hotfix-i386-x86_64-fpu-state.patch deleted file mode 100644 index 42389f237..000000000 --- a/package/base/linux26/99-hotfix-i386-x86_64-fpu-state.patch +++ /dev/null @@ -1,40 +0,0 @@ - -# ChangeSet - -# We need to clear all exceptions before synchronizing -# with the FPU, since we aren't ready to handle a FP -# exception here and we're getting rid of all FP state. - -# Special thanks to Alexander Nyberg for reports and -# testing. Alternate patches by Sergey Vlasov and Andi -# Kleen, who both worked on this. - -# Signed-off-by: Linus Torvalds - -diff -Nru a/include/asm-i386/i387.h b/include/asm-i386/i387.h ---- a/include/asm-i386/i387.h 2004-06-15 08:53:59 -07:00 -+++ b/include/asm-i386/i387.h 2004-06-15 08:53:59 -07:00 -@@ -51,7 +51,7 @@ - #define __clear_fpu( tsk ) \ - do { \ - if ((tsk)->thread_info->status & TS_USEDFPU) { \ -- asm volatile("fwait"); \ -+ asm volatile("fnclex ; fwait"); \ - (tsk)->thread_info->status &= ~TS_USEDFPU; \ - stts(); \ - } \ - -i -diff -Nru a/include/asm-x86_64/i387.h b/include/asm-x86_64/i387.h ---- a/include/asm-x86_64/i387.h 2004-06-15 08:54:33 -07:00 -+++ b/include/asm-x86_64/i387.h 2004-06-15 08:54:33 -07:00 -@@ -48,7 +48,7 @@ - - #define clear_fpu(tsk) do { \ - if ((tsk)->thread_info->status & TS_USEDFPU) { \ -- asm volatile("fwait"); \ -+ asm volatile("fnclex ; fwait"); \ - (tsk)->thread_info->status &= ~TS_USEDFPU; \ - stts(); \ - } \ - diff --git a/package/base/linux26/linux26.desc b/package/base/linux26/linux26.desc index 38af6c7a6..385bd06b8 100644 --- a/package/base/linux26/linux26.desc +++ b/package/base/linux26/linux26.desc @@ -38,8 +38,8 @@ [L] GPL [S] Stable -[V] 2.6.6 +[V] 2.6.7 [P] X -1---5---9 101.500 -[D] 556577714 linux-2.6.6.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/ +[D] 2651578800 linux-2.6.7.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/