- lockdep-irq-inclusion-consistency.patch removed from -mm tree

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

 



The patch titled

     lockdep: irq inclusion consistency

has been removed from the -mm tree.  Its filename is

     lockdep-irq-inclusion-consistency.patch

This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.

------------------------------------------------------
Subject: lockdep: irq inclusion consistency
From: Arjan van de Ven <arjan@xxxxxxxxxxxxx>


All but 5 architectures include asm/irq.h (directly or via linux/irq.h)
into their asm/hardirq.h. This is needed for the disable_irq() etc
definition now; just fix those 5 to get them the same as the rest.

(Needed to avoid lockdep build breakage)

Signed-off-by: Arjan van de Ven <arjan@xxxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 include/asm-alpha/hardirq.h   |    2 +-
 include/asm-cris/hardirq.h    |    1 +
 include/asm-m68k/hardirq.h    |    1 +
 include/asm-sparc/hardirq.h   |    1 +
 include/asm-sparc64/hardirq.h |    1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff -puN include/asm-alpha/hardirq.h~lockdep-irq-inclusion-consistency include/asm-alpha/hardirq.h
--- devel/include/asm-alpha/hardirq.h~lockdep-irq-inclusion-consistency	2006-06-04 02:19:38.000000000 -0700
+++ devel-akpm/include/asm-alpha/hardirq.h	2006-06-04 02:19:38.000000000 -0700
@@ -3,7 +3,7 @@
 
 #include <linux/threads.h>
 #include <linux/cache.h>
-
+#include <linux/irq.h>
 
 /* entry.S is sensitive to the offsets of these fields */
 typedef struct {
diff -puN include/asm-cris/hardirq.h~lockdep-irq-inclusion-consistency include/asm-cris/hardirq.h
--- devel/include/asm-cris/hardirq.h~lockdep-irq-inclusion-consistency	2006-06-04 02:19:38.000000000 -0700
+++ devel-akpm/include/asm-cris/hardirq.h	2006-06-04 02:19:38.000000000 -0700
@@ -3,6 +3,7 @@
 
 #include <linux/threads.h>
 #include <linux/cache.h>
+#include <linux/irq.h>
 
 typedef struct {
 	unsigned int __softirq_pending;
diff -puN include/asm-m68k/hardirq.h~lockdep-irq-inclusion-consistency include/asm-m68k/hardirq.h
--- devel/include/asm-m68k/hardirq.h~lockdep-irq-inclusion-consistency	2006-06-04 02:19:38.000000000 -0700
+++ devel-akpm/include/asm-m68k/hardirq.h	2006-06-04 02:19:38.000000000 -0700
@@ -3,6 +3,7 @@
 
 #include <linux/threads.h>
 #include <linux/cache.h>
+#include <linux/irq.h>
 
 /* entry.S is sensitive to the offsets of these fields */
 typedef struct {
diff -puN include/asm-sparc64/hardirq.h~lockdep-irq-inclusion-consistency include/asm-sparc64/hardirq.h
--- devel/include/asm-sparc64/hardirq.h~lockdep-irq-inclusion-consistency	2006-06-04 02:19:38.000000000 -0700
+++ devel-akpm/include/asm-sparc64/hardirq.h	2006-06-04 02:19:38.000000000 -0700
@@ -7,6 +7,7 @@
 #define __SPARC64_HARDIRQ_H
 
 #include <asm/cpudata.h>
+#include <linux/irq.h>
 
 #define __ARCH_IRQ_STAT
 #define local_softirq_pending() \
diff -puN include/asm-sparc/hardirq.h~lockdep-irq-inclusion-consistency include/asm-sparc/hardirq.h
--- devel/include/asm-sparc/hardirq.h~lockdep-irq-inclusion-consistency	2006-06-04 02:19:38.000000000 -0700
+++ devel-akpm/include/asm-sparc/hardirq.h	2006-06-04 02:19:38.000000000 -0700
@@ -10,6 +10,7 @@
 #include <linux/threads.h>
 #include <linux/spinlock.h>
 #include <linux/cache.h>
+#include <linux/irq/h>
 
 /* entry.S is sensitive to the offsets of these fields */ /* XXX P3 Is it? */
 typedef struct {
_

Patches currently in -mm which might be from arjan@xxxxxxxxxxxxx are

git-acpi.patch
ieee1394-semaphore-to-mutex-conversion.patch
git-infiniband.patch
git-mtd.patch
lock-validator-netlinkc-netlink_table_grab-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-tidy.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-arch_vma_name-fix.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386.patch
vdso-randomize-the-i386-vdso-by-moving-it-into-a-vma-vs-x86_64-mm-reliable-stack-trace-support-i386-2.patch
lockdep-irq-inclusion-consistency.patch
lock-validator-special-locking-sb-s_umount-2.patch
lockdep-annotate-rpc_populate-for.patch
lock-validator-special-locking-sound-core-seq-seq_devicec-fix.patch
lock-validator-select-kallsyms_all.patch
debug-shared-irqs.patch
vdso-print-fatal-signals.patch
vdso-improve-print_fatal_signals-support-by-adding-memory-maps.patch

-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux