[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/kernel/devel kernel-2.6.spec, 1.2782, 1.2783 linux-2.6-lockdep-fixes.patch, 1.39, 1.40



Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3795

Modified Files:
	kernel-2.6.spec linux-2.6-lockdep-fixes.patch 
Log Message:
apm lockdep fix


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2782
retrieving revision 1.2783
diff -u -r1.2782 -r1.2783
--- kernel-2.6.spec	12 Oct 2006 20:56:14 -0000	1.2782
+++ kernel-2.6.spec	12 Oct 2006 20:59:09 -0000	1.2783
@@ -2041,6 +2041,7 @@
 - Fix kernel oops with bluetooth/rfcomm. (#208628)
 - Fix utrace so that SIGTRAP can be caught. (#205659)
 - GFS2: Fix kunmap_atomic for highmem systems
+- APM lockdep fix.
 
 * Wed Oct 11 2006 Jon Masters <jcm redhat com>
 - Silence a stupid error in find-provides for non-kABI subpackages.

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 +
 b/drivers/net/bonding/bond_main.c                      |    5 
 drivers/input/serio/libps2.c                           |    4 
 fs/block_dev.c                                         |   11 -
 kernel/lockdep.c                                       |    1 
 linux-2.6.17-mm6/include/net/sock.h                    |   33 ++-
 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.18.noarch/arch/i386/kernel/apm.c             |   25 +-
 linux-2.6.18.noarch/block/ioctl.c                      |    4 
 linux-2.6.18.noarch/drivers/char/sysrq.c               |    1 
 linux-2.6.18.noarch/drivers/input/serio/libps2.c       |    4 
 linux-2.6.18.noarch/drivers/input/serio/serio.c        |    9 
 linux-2.6.18.noarch/drivers/md/md.c                    |    6 
 linux-2.6.18.noarch/drivers/usb/serial/cyberjack.c     |    6 
 linux-2.6.18.noarch/drivers/usb/serial/generic.c       |    6 
 linux-2.6.18.noarch/drivers/usb/serial/ipw.c           |    6 
 linux-2.6.18.noarch/drivers/usb/serial/ir-usb.c        |    6 
 linux-2.6.18.noarch/drivers/usb/serial/keyspan_pda.c   |    6 
 linux-2.6.18.noarch/drivers/usb/serial/omninet.c       |    6 
 linux-2.6.18.noarch/drivers/usb/serial/safe_serial.c   |    6 
 linux-2.6.18.noarch/fs/block_dev.c                     |  180 +++++------------
 linux-2.6.18.noarch/include/linux/fs.h                 |   17 -
 linux-2.6.18.noarch/include/linux/libps2.h             |    7 
 linux-2.6.18.noarch/include/linux/lockdep.h            |   12 -
 linux-2.6.18.noarch/include/linux/serio.h              |    1 
 linux-2.6.18.noarch/include/net/sock.h                 |   19 +
 linux-2.6.18.noarch/kernel/fork.c                      |    4 
 linux-2.6.18.noarch/kernel/lockdep.c                   |   10 
 linux-2.6.18.noarch/kernel/mutex-debug.c               |    2 
 linux-2.6.18.noarch/lib/rwsem-spinlock.c               |    2 
 linux-2.6.18.noarch/lib/rwsem.c                        |    2 
 linux-2.6.18.noarch/lib/spinlock_debug.c               |    4 
 linux-2.6.18.noarch/net/core/sock.c                    |    2 
 linux-2.6.18.noarch/net/decnet/af_decnet.c             |    5 
 linux-2.6.18.noarch/net/sunrpc/svcsock.c               |   33 +++
 linux-2.6.18.noarch/net/sunrpc/xprtsock.c              |   33 +++
 linux-2.6/arch/arm/kernel/ecard.c                      |    2 
 linux-2.6/arch/i386/kernel/smpboot.c                   |    2 
 linux-2.6/arch/powerpc/platforms/powermac/cpufreq_64.c |    2 
 linux-2.6/arch/powerpc/platforms/powermac/nvram.c      |    4 
 linux-2.6/block/as-iosched.c                           |    2 
 linux-2.6/block/cfq-iosched.c                          |    2 
 linux-2.6/drivers/block/DAC960.c                       |    2 
 linux-2.6/drivers/block/cciss.c                        |    6 
 linux-2.6/drivers/block/cciss_scsi.c                   |    2 
 linux-2.6/drivers/block/paride/pd.c                    |    2 
 linux-2.6/drivers/block/pktcdvd.c                      |    2 
 linux-2.6/drivers/ide/ide-tape.c                       |    2 
 linux-2.6/drivers/macintosh/smu.c                      |    4 
 linux-2.6/drivers/macintosh/windfarm_smu_controls.c    |    2 
 linux-2.6/drivers/macintosh/windfarm_smu_sensors.c     |    2 
 linux-2.6/drivers/s390/scsi/zfcp_scsi.c                |    2 
 linux-2.6/drivers/scsi/53c700.c                        |    2 
 linux-2.6/drivers/scsi/aic7xxx/aic79xx_osm.c           |    4 
 linux-2.6/drivers/scsi/aic7xxx/aic7xxx_osm.c           |    2 
 linux-2.6/drivers/scsi/gdth.c                          |    4 
 linux-2.6/drivers/scsi/qla1280.c                       |    4 
 linux-2.6/drivers/usb/gadget/inode.c                   |    2 
 linux-2.6/drivers/usb/gadget/omap_udc.c                |    2 
 linux-2.6/mm/slab.c                                    |   55 +++--
 linux-2.6/net/ipv4/ipvs/ip_vs_sync.c                   |    2 
 net/core/sock.c                                        |   23 --
 69 files changed, 419 insertions(+), 299 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- linux-2.6-lockdep-fixes.patch	12 Oct 2006 16:45:29 -0000	1.39
+++ linux-2.6-lockdep-fixes.patch	12 Oct 2006 20:59:09 -0000	1.40
@@ -3453,3 +3453,144 @@
  #endif
 
 
+From davej  Mon Oct  9 14:17:42 2006
+Return-Path: <rhkernel-list-admin redhat com>
+X-Spam-Checker-Version: SpamAssassin 3.1.4 (2006-07-25) on 
+	pressure.kernelslacker.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL,BAYES_00,
+	UNPARSEABLE_RELAY autolearn=ham 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 localhost> (single-drop); Mon, 09 Oct 2006 14:17:42 -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;
+	 Mon, 09 Oct 2006 14:15:17 -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 k99IFH3U012252;
+	Mon, 9 Oct 2006 14:15:17 -0400
+Received: from post-office.corp.redhat.com (post-office.corp.redhat.com [172.16.52.227])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k99IFAep023131;
+	Mon, 9 Oct 2006 14:15:10 -0400
+Received: from post-office.corp.redhat.com (localhost.localdomain [127.0.0.1])
+	by post-office.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k99IFAl03667;
+	Mon, 9 Oct 2006 14:15:10 -0400
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+	by post-office.corp.redhat.com (8.11.6/8.11.6) with ESMTP id k99IEhl03467
+	for <rhkernel-list post-office corp redhat com>; Mon, 9 Oct 2006 14:14:43 -0400
+Received: from pobox.stuttgart.redhat.com (pobox.stuttgart.redhat.com [172.16.2.10])
+	by int-mx1.corp.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id k99IEgna022875
+	for <rhkernel-list int-mx1 corp redhat com>; Mon, 9 Oct 2006 14:14:42 -0400
+Received: from vpn-4-63.str.redhat.com (vpn-4-63.str.redhat.com [10.32.4.63])
+	by pobox.stuttgart.redhat.com (8.12.8/8.12.8) with ESMTP id k99IEeUa001189;
+	Mon, 9 Oct 2006 20:14:40 +0200
+Subject: [RHEL5 PATCH] lockdep: annotate i386-apm irq usage
+From: Peter Zijlstra <pzijlstr redhat com>
+To: rhkernel-list redhat com
+Cc: Don Zickus <dzickus redhat com>
+Content-Type: text/plain
+Message-Id: <1160417678 7005 3 camel lappy>
+Mime-Version: 1.0
+X-Mailer: Evolution 2.6.1 
+Content-Transfer-Encoding: 7bit
+X-loop: rhkernel-list redhat com
+Sender: rhkernel-list-admin redhat com
+Errors-To: rhkernel-list-admin redhat com
+X-BeenThere: rhkernel-list redhat com
+X-Mailman-Version: 2.0.13
+Precedence: bulk
+Reply-To: rhkernel-list redhat com
+List-Help: <mailto:rhkernel-list-request redhat com?subject=help>
+List-Post: <mailto:rhkernel-list redhat com>
+List-Subscribe: <http://post-office.corp.redhat.com/mailman/listinfo/rhkernel-list>,
+	<mailto:rhkernel-list-request redhat com?subject=subscribe>
+List-Id: Red Hat INTERNAL-ONLY kernel discussion list <rhkernel-list.redhat.com>
+List-Unsubscribe: <http://post-office.corp.redhat.com/mailman/listinfo/rhkernel-list>,
+	<mailto:rhkernel-list-request redhat com?subject=unsubscribe>
+List-Archive: <http://post-office.corp.redhat.com/archives/rhkernel-list/>
+Date: Mon, 09 Oct 2006 20:14:38 +0200
+Status: RO
+Content-Length: 2405
+Lines: 79
+
+BZ209480
+
+---
+
+Lockdep doesn't like to enable interrupts when they are enabled already.
+
+BUG: warning at kernel/lockdep.c:1814/trace_hardirqs_on() (Not tainted)
+ [<c04051ed>] show_trace_log_lvl+0x58/0x16a
+ [<c04057fa>] show_trace+0xd/0x10
+ [<c0405913>] dump_stack+0x19/0x1b
+ [<c043abfb>] trace_hardirqs_on+0xa2/0x11e
+ [<c041463c>] apm_bios_call_simple+0xcd/0xfd
+ [<c0415242>] apm+0x92/0x5b1
+ [<c0402005>] kernel_thread_helper+0x5/0xb
+DWARF2 unwinder stuck at kernel_thread_helper+0x5/0xb
+Leftover inexact backtrace:
+ [<c04057fa>] show_trace+0xd/0x10
+ [<c0405913>] dump_stack+0x19/0x1b
+ [<c043abfb>] trace_hardirqs_on+0xa2/0x11e
+ [<c041463c>] apm_bios_call_simple+0xcd/0xfd
+ [<c0415242>] apm+0x92/0x5b1
+ [<c0402005>] kernel_thread_helper+0x5/0xb
+
+Signed-off-by: Peter Zijlstra <a p zijlstra chello nl>
+---
+ arch/i386/kernel/apm.c |   25 ++++++++++++++++++-------
+ 1 file changed, 18 insertions(+), 7 deletions(-)
+
+Index: linux-2.6.18.noarch/arch/i386/kernel/apm.c
+===================================================================
+--- linux-2.6.18.noarch.orig/arch/i386/kernel/apm.c
++++ linux-2.6.18.noarch/arch/i386/kernel/apm.c
+@@ -539,11 +539,22 @@ static inline void apm_restore_cpus(cpum
+  * Also, we KNOW that for the non error case of apm_bios_call, there
+  * is no useful data returned in the low order 8 bits of eax.
+  */
+-#define APM_DO_CLI	\
+-	if (apm_info.allow_ints) \
+-		local_irq_enable(); \
+-	else \
+-		local_irq_disable();
++#define APM_DO_CLI \
++	do { \
++		if (apm_info.allow_ints) { \
++			if (irqs_disabled_flags(flags)) \
++				local_irq_enable(); \
++		} else \
++			local_irq_disable(); \
++	} while (0)
++
++#define APM_DO_STI \
++	do { \
++		if (irqs_disabled_flags(flags)) \
++			local_irq_disable(); \
++		else if (irqs_disabled()) \
++			local_irq_enable(); \
++	} while (0)
+ 
+ #ifdef APM_ZERO_SEGS
+ #	define APM_DECL_SEGS \
+@@ -600,7 +611,7 @@ static u8 apm_bios_call(u32 func, u32 eb
+ 	APM_DO_SAVE_SEGS;
+ 	apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi);
+ 	APM_DO_RESTORE_SEGS;
+-	local_irq_restore(flags);
++	APM_DO_STI;
+ 	gdt[0x40 / 8] = save_desc_40;
+ 	put_cpu();
+ 	apm_restore_cpus(cpus);
+@@ -644,7 +655,7 @@ static u8 apm_bios_call_simple(u32 func,
+ 	APM_DO_SAVE_SEGS;
+ 	error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax);
+ 	APM_DO_RESTORE_SEGS;
+-	local_irq_restore(flags);
++	APM_DO_STI;
+ 	gdt[0x40 / 8] = save_desc_40;
+ 	put_cpu();
+ 	apm_restore_cpus(cpus);
+
+


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]