rpms/kernel/devel kernel-2.6.spec, 1.2700, 1.2701 linux-2.6-lockdep-fixes.patch, 1.30, 1.31
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Sep 27 18:04:22 UTC 2006
Author: davej
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1984
Modified Files:
kernel-2.6.spec linux-2.6-lockdep-fixes.patch
Log Message:
yet more lockdep fixes.
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2700
retrieving revision 1.2701
diff -u -r1.2700 -r1.2701
--- kernel-2.6.spec 27 Sep 2006 05:03:02 -0000 1.2700
+++ kernel-2.6.spec 27 Sep 2006 18:04:20 -0000 1.2701
@@ -1921,6 +1921,9 @@
%endif
%changelog
+* Wed Sep 27 2006 Dave Jones <davej at redhat.com>
+- yet more lockdep fixes.
+
* Tue Sep 26 2006 Dave Jones <davej at redhat.com>
- Enable serverworks IDE driver for x86-64.
- More lockdep fixes.
linux-2.6-lockdep-fixes.patch:
a/drivers/ieee1394/nodemgr.c | 9 ++--
a/drivers/net/forcedeth.c | 31 ++++++++------
a/fs/nfsd/nfsproc.c | 2
a/fs/nfsd/vfs.c | 8 +--
a/include/linux/nfsd/nfsfh.h | 11 ++++-
a/kernel/lockdep.c | 13 ++++++
a/net/ipv6/tcp_ipv6.c | 2
linux-2.6-lappy/drivers/char/sysrq.c | 1
linux-2.6.17-mm6/include/net/sock.h | 33 ++++++++++++++-
linux-2.6.17.noarch/drivers/char/rtc.c | 5 +-
linux-2.6.18-rc1/drivers/input/serio/libps2.c | 6 +-
linux-2.6.18-rc1/include/linux/libps2.h | 12 +++++
linux-2.6.18-rc1/net/socket.c | 8 +++
linux-2.6/mm/slab.c | 55 +++++++++++++++++++-------
14 files changed, 147 insertions(+), 49 deletions(-)
Index: linux-2.6-lockdep-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-lockdep-fixes.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- linux-2.6-lockdep-fixes.patch 27 Sep 2006 03:39:06 -0000 1.30
+++ linux-2.6-lockdep-fixes.patch 27 Sep 2006 18:04:20 -0000 1.31
@@ -1110,3 +1110,99 @@
{
struct device *dev;
_
+From davej Tue Sep 26 11:14:11 2006
+Return-Path: <a.p.zijlstra at chello.nl>
+X-Spam-Checker-Version: SpamAssassin 3.1.4 (2006-07-25) on
+ pressure.kernelslacker.org
+X-Spam-Level:
+X-Spam-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00,
+ DNS_FROM_RFC_POST,UNPARSEABLE_RELAY autolearn=no version=3.1.4
+Received: from pobox.devel.redhat.com [10.11.255.8]
+ by pressure.kernelslacker.org with IMAP (fetchmail-6.3.4)
+ for <davej at localhost> (single-drop); Tue, 26 Sep 2006 11:14:11 -0400 (EDT)
+Received: from pobox.devel.redhat.com ([unix socket])
+ by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
+ Tue, 26 Sep 2006 11:13:38 -0400
+X-Sieve: CMU Sieve 2.2
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+ by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id k8QFDbDf000537;
+ Tue, 26 Sep 2006 11:13:37 -0400
+Received: from mx1.redhat.com (mx1.redhat.com [172.16.48.31])
+ by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8QFDb0x018175;
+ Tue, 26 Sep 2006 11:13:37 -0400
+Received: from amsfep18-int.chello.nl (amsfep17-int.chello.nl [213.46.243.15])
+ by mx1.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k8QFDZtL023564;
+ Tue, 26 Sep 2006 11:13:36 -0400
+Received: from lappy ([62.194.129.232]) by amsfep18-int.chello.nl
+ (InterMail vM.6.01.04.04 201-2131-118-104-20050224) with ESMTP
+ id <20060926151323.YQIB12200.amsfep18-int.chello.nl at lappy>;
+ Tue, 26 Sep 2006 17:13:23 +0200
+Subject: [PATCH] sysrq: disable lockdep on reboot
+From: Peter Zijlstra <a.p.zijlstra at chello.nl>
+To: linux-kernel <linux-kernel at vger.kernel.org>, Andrew Morton <akpm at osdl.org>
+Cc: notting at redhat.com, Dave Jones <davej at redhat.com>,
+ Ingo Molnar <mingo at elte.hu>, arjan <arjan at infradead.org>
+Content-Type: text/plain
+Date: Tue, 26 Sep 2006 17:13:21 +0200
+Message-Id: <1159283602.5038.25.camel at lappy>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.6.1
+Content-Transfer-Encoding: 7bit
+X-RedHat-Spam-Score: 2.646 **
+Status: RO
+Content-Length: 1914
+Lines: 52
+
+SysRq : Emergency Sync
+Emergency Sync complete
+SysRq : Emergency Remount R/O
+Emergency Remount complete
+SysRq : Resetting
+BUG: warning at kernel/lockdep.c:1816/trace_hardirqs_on() (Not tainted)
+
+Call Trace:
+ [<ffffffff8026d56d>] show_trace+0xae/0x319
+ [<ffffffff8026d7ed>] dump_stack+0x15/0x17
+ [<ffffffff802a68d1>] trace_hardirqs_on+0xbc/0x13d
+ [<ffffffff803a8eec>] sysrq_handle_reboot+0x9/0x11
+ [<ffffffff803a8f8d>] __handle_sysrq+0x99/0x130
+ [<ffffffff803a903b>] handle_sysrq+0x17/0x19
+ [<ffffffff803a36ee>] kbd_event+0x32e/0x57d
+ [<ffffffff80401e35>] input_event+0x42d/0x45b
+ [<ffffffff804063eb>] atkbd_interrupt+0x44d/0x53d
+ [<ffffffff803fe5c5>] serio_interrupt+0x49/0x86
+ [<ffffffff803ff2a4>] i8042_interrupt+0x202/0x21a
+ [<ffffffff80210cf0>] handle_IRQ_event+0x2c/0x64
+ [<ffffffff802bfd8b>] __do_IRQ+0xaf/0x114
+ [<ffffffff8026ea24>] do_IRQ+0xf8/0x107
+ [<ffffffff8025f886>] ret_from_intr+0x0/0xf
+DWARF2 unwinder stuck at ret_from_intr+0x0/0xf
+Leftover inexact backtrace:
+ <IRQ> <EOI> [<ffffffff80258e36>] mwait_idle+0x3f/0x54
+ [<ffffffff8024a33a>] cpu_idle+0xa2/0xc5
+ [<ffffffff8026c34e>] rest_init+0x2b/0x2d
+ [<ffffffff809708bc>] start_kernel+0x24a/0x24c
+ [<ffffffff8097028b>] _sinittext+0x28b/0x292
+
+Since we're shutting down anyway, don't bother being smart,
+just turn the thing off.
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra at chello.nl>
+---
+ drivers/char/sysrq.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: linux-2.6-lappy/drivers/char/sysrq.c
+===================================================================
+--- linux-2.6-lappy.orig/drivers/char/sysrq.c 2006-09-26 17:08:02.000000000 +0200
++++ linux-2.6-lappy/drivers/char/sysrq.c 2006-09-26 17:10:16.000000000 +0200
+@@ -113,6 +113,7 @@ static struct sysrq_key_op sysrq_crashdu
+ static void sysrq_handle_reboot(int key, struct pt_regs *pt_regs,
+ struct tty_struct *tty)
+ {
++ lockdep_off();
+ local_irq_enable();
+ emergency_restart();
+ }
+
+
More information about the fedora-cvs-commits
mailing list