From: Greg Kroah-Hartman Date: Sat, 17 Mar 2007 04:40:34 +0000 (-0700) Subject: remove patch that breaks the build X-Git-Tag: v2.6.20.4~7 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=178bf5baa9b67192e2d16c8d74656cdbeb83bede;p=thirdparty%2Fkernel%2Fstable-queue.git remove patch that breaks the build --- diff --git a/queue-2.6.20/initialise-sak-member-for-each-virtual-console-to-prevent-oops.patch b/queue-2.6.20/initialise-sak-member-for-each-virtual-console-to-prevent-oops.patch deleted file mode 100644 index 67a85c6f17d..00000000000 --- a/queue-2.6.20/initialise-sak-member-for-each-virtual-console-to-prevent-oops.patch +++ /dev/null @@ -1,77 +0,0 @@ -From stable-bounces@linux.kernel.org Fri Mar 16 14:39:59 2007 -From: Bernhard Walle -Date: Fri, 16 Mar 2007 13:38:30 -0800 -Subject: Initialise SAK member for each virtual console to prevent oops -To: torvalds@linux-foundation.org -Cc: stable@kernel.org, akpm@linux-foundation.org, bwalle@suse.de, ebiederm@xmission.com -Message-ID: <200703162138.l2GLcU8Y022399@shell0.pdx.osdl.net> - -From: Bernhard Walle - -Initialise the SAK member of the vc_cons variable on all virtual terminals, -not only the first one. This prevents an oops when trying Sysrq-C on e.g. -the second virtual terminal: - - kernel BUG at kernel/workqueue.c:212! - invalid opcode: 0000 [1] SMP - CPU 0 - Modules linked in: i915 drm deflate zlib_deflate twofish twofish_common serpent blowfish des ce - Pid: 0, comm: swapper Not tainted 2.6.21-rc3-default #15 - RIP: 0010:[] [] queue_work+0x32/0x51 - RSP: 0018:ffffffff805fada8 EFLAGS: 00010013 - RAX: ffffffff80683f38 RBX: ffffffff804ae700 RCX: 0000000000000000 - RDX: 0000000000000000 RSI: ffffffff80683f30 RDI: ffff81000134a840 - RBP: 0000000000000001 R08: 0000000000000005 R09: 0000000000000002 - R10: ffffffff805990e0 R11: ffff810037f4c0f0 R12: 000000000000006b - R13: ffff81007aa23000 R14: 0000000000000001 R15: 0000000000000096 - FS: 0000000000000000(0000) GS:ffffffff804d8000(0000) knlGS:0000000000000000 - CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b - CR2: 00002b72026e9000 CR3: 0000000079175000 CR4: 00000000000006e0 - Process swapper (pid: 0, threadinfo ffffffff8059e000, task ffffffff80490840) - Stack: 0000000000000096 ffffffff803635db ffffffff805fadf8 0000000000000001 - ffff8100013c2e40 0000000000000025 ffff81007c931c00 ffff81007aa23000 - 0000000000000001 ffffffff8035e3ee 0000000000000092 ffff810037cc8000 - Call Trace: - [] __handle_sysrq+0x98/0x129 - [] kbd_event+0x32e/0x56a - [] input_event+0x422/0x44a - [] atkbd_interrupt+0x449/0x503 - [] serio_interrupt+0x37/0x6f - [] i8042_interrupt+0x1f4/0x20a - [] smp_send_timer_broadcast_ipi+0x2d/0x4e - [] handle_IRQ_event+0x25/0x53 - [] handle_edge_irq+0xe4/0x128 - [] call_softirq+0x1c/0x28 - [] do_IRQ+0x6c/0xd3 - [] mwait_idle+0x0/0x45 - [] ret_from_intr+0x0/0xa - [] datagram_poll+0x0/0xc8 - [] mwait_idle+0x42/0x45 - [] cpu_idle+0x8b/0xae - [] start_kernel+0x2b9/0x2c5 - [] _sinittext+0x15e/0x162 - - Code: 0f 0b eb fe 48 8b 07 48 63 d2 48 f7 d0 48 8b 3c d0 e8 13 ff - RIP [] queue_work+0x32/0x51 - RSP - Kernel panic - not syncing: Aiee, killing interrupt handler! - -Signed-off-by: Bernhard Walle -Acked-by: Eric Biederman -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/char/vt.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/char/vt.c -+++ b/drivers/char/vt.c -@@ -727,6 +727,7 @@ int vc_allocate(unsigned int currcons) / - return -ENOMEM; - memset(vc, 0, sizeof(*vc)); - vc_cons[currcons].d = vc; -+ INIT_WORK(&vc_cons[currcons].SAK_work, vc_SAK); - visual_init(vc, currcons, 1); - if (!*vc->vc_uni_pagedir_loc) - con_set_default_unimap(vc); diff --git a/queue-2.6.20/series b/queue-2.6.20/series index e0eaabb0e8b..7d4ca1b78d8 100644 --- a/queue-2.6.20/series +++ b/queue-2.6.20/series @@ -8,7 +8,6 @@ ia64-fix-null-pointer-in-ia64-irq_chip-mask-unmask-function.patch adjust-legacy-ide-resource-setting.patch mm-fix-madvise-infinine-loop.patch ehci-add-delay-to-bus_resume-before-accessing-ports.patch -initialise-sak-member-for-each-virtual-console-to-prevent-oops.patch initialise-pi_lock-if-config_rt_mutexes-n.patch futex-pi-state-locking-fix.patch nfs-nfs_getattr-can-t-call-nfs_sync_mapping_range-for-non-regular-files.patch