From 1073f401f018f85321192c86e16cdbdb5ce7c9fa Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Mon, 9 Oct 2006 10:19:22 +0000 Subject: [PATCH] dont apply svn path=/dists/trunk/linux-2.6/; revision=7586 --- debian/changelog | 2 - .../bugfix/mips/headers_install-add.patch | 19 ---------- .../bugfix/mips/sb1250_interrupt_fixes.patch | 37 ------------------- debian/patches/series/3 | 2 - 4 files changed, 60 deletions(-) delete mode 100644 debian/patches/bugfix/mips/headers_install-add.patch delete mode 100644 debian/patches/bugfix/mips/sb1250_interrupt_fixes.patch diff --git a/debian/changelog b/debian/changelog index a2c60f23d..822f021d7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,6 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low * [mips] Apply some patches from linux-mips' linux-2.6.18-stable GIT tree: - The o32 fstatat syscall behaves differently on 32 and 64 bit kernels - fstatat syscall names - - Have headers_install install and . - - SB1250: Interrupt handler fixes - BCM1480: Mask pending interrupts against c0_status.im. - Cobalt: Time runs too quickly - Show actual CPU information in /proc/cpuinfo diff --git a/debian/patches/bugfix/mips/headers_install-add.patch b/debian/patches/bugfix/mips/headers_install-add.patch deleted file mode 100644 index e74b9661d..000000000 --- a/debian/patches/bugfix/mips/headers_install-add.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Ralf Baechle -Date: Sat, 23 Sep 2006 17:08:36 +0000 (+0100) -Subject: [MIPS] Have headers_install install and . -X-Git-Tag: linux-1.1.68 -X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff;h=e70d9b79a35ac822ec5913278d2472aa728d1476 - -[MIPS] Have headers_install install and . - -Signed-off-by: Ralf Baechle -(cherry picked from 2ff556ab120549346660fd7e0cd25782ebe5381d commit) ---- - ---- a/include/asm-mips/Kbuild -+++ b/include/asm-mips/Kbuild -@@ -1,3 +1,3 @@ - include include/asm-generic/Kbuild.asm - --header-y += sgidefs.h -+header-y += cachectl.h sgidefs.h sysmips.h diff --git a/debian/patches/bugfix/mips/sb1250_interrupt_fixes.patch b/debian/patches/bugfix/mips/sb1250_interrupt_fixes.patch deleted file mode 100644 index 241b416b9..000000000 --- a/debian/patches/bugfix/mips/sb1250_interrupt_fixes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Maciej W. Rozycki -Date: Tue, 3 Oct 2006 11:42:02 +0000 (+0100) -Subject: [MIPS] SB1250: Interrupt handler fixes -X-Git-Tag: linux-1.1.68 -X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff;h=c9477be2bb9e9a1885630627f439d19d7df6d33a - -[MIPS] SB1250: Interrupt handler fixes - -Mask cp0.status against cp0.cause. Additionally, spurious interrupts are -not recorded. - -Signed-off-by: Maciej W. Rozycki -Signed-off-by: Ralf Baechle -(cherry picked from 0196782e2ac607a19cfc88d9d2bd3f3f03e5908b commit) ---- - ---- a/arch/mips/sibyte/sb1250/irq.c -+++ b/arch/mips/sibyte/sb1250/irq.c -@@ -442,7 +442,7 @@ asmlinkage void plat_irq_dispatch(struct - * blasting the high 32 bits. - */ - -- pending = read_c0_cause(); -+ pending = read_c0_cause() & read_c0_status(); - - #ifdef CONFIG_SIBYTE_SB1250_PROF - if (pending & CAUSEF_IP7) /* Cpu performance counter interrupt */ -@@ -476,5 +476,8 @@ asmlinkage void plat_irq_dispatch(struct - R_IMR_INTERRUPT_STATUS_BASE))); - if (mask) - do_IRQ(fls64(mask) - 1, regs); -- } -+ else -+ spurious_interrupt(regs); -+ } else -+ spurious_interrupt(regs); - } diff --git a/debian/patches/series/3 b/debian/patches/series/3 index 59c19ef93..a7211fd12 100644 --- a/debian/patches/series/3 +++ b/debian/patches/series/3 @@ -1,8 +1,6 @@ + alpha-prctl.patch + bugfix/mips/o32_fstatat_syscall.patch + bugfix/mips/fstatat_syscall_names.patch -+ bugfix/mips/headers_install-add.patch -+ bugfix/mips/sb1250_interrupt_fixes.patch + bugfix/mips/sb1480_interrupt_fixes.patch + bugfix/mips/cobalt_hz.patch + bugfix/mips/real-cpu-cpuinfo.patch