Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags

* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags: Fix IRQ flag handling naming MIPS: Add missing #inclusions of <linux/irq.h> smc91x: Add missing #inclusion of <linux/irq.h> Drop a couple of unnecessary asm/system.h inclusions SH: Add missing consts to sys_execve() declaration Blackfin: Rename IRQ flags handling functions Blackfin: Add missing dep to asm/irqflags.h Blackfin: Rename DES PC2() symbol to avoid collision Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header Blackfin: Split PLL code from mach-specific cdef headers
author: Linus Torvalds <torvalds@linux-foundation.org> 2010-10-21 17:37:27 -0400
committer: Linus Torvalds <torvalds@linux-foundation.org> 2010-10-21 17:37:27 -0400
commit: e36f561a2c88394ef2708f1ab300fe8a79e9f651 (patch)
tree: 385f378c4240955e4356d49686a8ef606a82a7c1 /include/linux
parent: 70ada77920723fbc2b35e9b301022fb1e166b41b (diff)
parent: df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 (diff)
4 files changed, 65 insertions, 45 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h
index 96c323ac44df..8a389b608ce3 100644
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
@@ -8,7 +8,6 @@
 #include <linux/lockdep.h>
 #include <linux/ftrace_irq.h>
 #include <asm/hardirq.h>
-#include <asm/system.h>
 /*
 * We put the hardirq and softirq counter into the preemption
diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 006bf45eae30..d176d658fe25 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -12,6 +12,7 @@
 #define _LINUX_TRACE_IRQFLAGS_H
 #include <linux/typecheck.h>
+#include <asm/irqflags.h>
 #ifdef CONFIG_TRACE_IRQFLAGS
  extern void trace_softirqs_on(unsigned long ip);
@@ -52,17 +53,45 @@
 # define start_critical_timings() do { } while (0)
 #endif
-#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+/*
+ * Wrap the arch provided IRQ routines to provide appropriate checks.
-#include <asm/irqflags.h>
+ */
+#define raw_local_irq_disable()         arch_local_irq_disable()
+#define raw_local_irq_enable()          arch_local_irq_enable()
+#define raw_local_irq_save(flags)                       \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                flags = arch_local_irq_save();          \
+        } while (0)
+#define raw_local_irq_restore(flags)                    \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                arch_local_irq_restore(flags);          \
+        } while (0)
+#define raw_local_save_flags(flags)                     \
+        do {                                            \
+                typecheck(unsigned long, flags);        \
+                flags = arch_local_save_flags();        \
+        } while (0)
+#define raw_irqs_disabled_flags(flags)                  \
+        ({                                              \
+                typecheck(unsigned long, flags);        \
+                arch_irqs_disabled_flags(flags);        \
+        })
+#define raw_irqs_disabled()             (arch_irqs_disabled())
+#define raw_safe_halt()                 arch_safe_halt()
+/*
+ * The local_irq_*() APIs are equal to the raw_local_irq*()
+ * if !TRACE_IRQFLAGS.
+ */
+#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
 #define local_irq_enable() \
        do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0)
 #define local_irq_disable() \
        do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)
 #define local_irq_save(flags)                           \
        do {                                            \
-                typecheck(unsigned long, flags);        \
                raw_local_irq_save(flags);              \
                trace_hardirqs_off();                   \
        } while (0)
@@ -70,7 +99,6 @@
 #define local_irq_restore(flags)                        \
        do {                                            \
-                typecheck(unsigned long, flags);        \
                if (raw_irqs_disabled_flags(flags)) {   \
                        raw_local_irq_restore(flags);   \
                        trace_hardirqs_off();           \
@@ -79,51 +107,44 @@
                        raw_local_irq_restore(flags);   \
                }                                       \
        } while (0)
-#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */
+#define local_save_flags(flags)                         \
-/*
- * The local_irq_*() APIs are equal to the raw_local_irq*()
- * if !TRACE_IRQFLAGS.
- */
-# define raw_local_irq_disable()        local_irq_disable()
-# define raw_local_irq_enable()         local_irq_enable()
-# define raw_local_irq_save(flags)                      \
-        do {                                            \
-                typecheck(unsigned long, flags);        \
-                local_irq_save(flags);                  \
-        } while (0)
-# define raw_local_irq_restore(flags)                   \
        do {                                            \
-                typecheck(unsigned long, flags);        \
+                raw_local_save_flags(flags);            \
-                local_irq_restore(flags);               \
        } while (0)
-#endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
-#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+#define irqs_disabled_flags(flags)                      \
-#define safe_halt()                                             \
+        ({                                              \
-        do {                                                    \
+                raw_irqs_disabled_flags(flags);         \
-                trace_hardirqs_on();                            \
+        })
-                raw_safe_halt();                                \
-        } while (0)
-#define local_save_flags(flags)                         \
+#define irqs_disabled()                                 \
-        do {                                            \
+        ({                                              \
-                typecheck(unsigned long, flags);        \
+                unsigned long _flags;                   \
-                raw_local_save_flags(flags);            \
+                raw_local_save_flags(_flags);           \
+                raw_irqs_disabled_flags(_flags);        \
+        })
+#define safe_halt()                             \
+        do {                                    \
+                trace_hardirqs_on();            \
+                raw_safe_halt();                \
        } while (0)
-#define irqs_disabled()                                         \
-({                                                              \
-        unsigned long _flags;                                   \
-                                                                \
-        raw_local_save_flags(_flags);                           \
-        raw_irqs_disabled_flags(_flags);                        \
-})
-#define irqs_disabled_flags(flags)              \
+#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */
-({                                              \
-        typecheck(unsigned long, flags);        \
+#define local_irq_enable()      do { raw_local_irq_enable(); } while (0)
-        raw_irqs_disabled_flags(flags);         \
+#define local_irq_disable()     do { raw_local_irq_disable(); } while (0)
-})
+#define local_irq_save(flags)                                   \
+        do {                                                    \
+                raw_local_irq_save(flags);                      \
+        } while (0)
+#define local_irq_restore(flags) do { raw_local_irq_restore(flags); } while (0)
+#define local_save_flags(flags) do { raw_local_save_flags(flags); } while (0)
+#define irqs_disabled()         (raw_irqs_disabled())
+#define irqs_disabled_flags(flags) (raw_irqs_disabled_flags(flags))
+#define safe_halt()             do { raw_safe_halt(); } while (0)
 #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
 #endif
diff --git a/include/linux/list.h b/include/linux/list.h
index d167b5d7c0ac..88a000617d77 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -5,7 +5,6 @@
 #include <linux/stddef.h>
 #include <linux/poison.h>
 #include <linux/prefetch.h>
-#include <asm/system.h>
 /*
 * Simple doubly linked list implementation.
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
index f8854655860e..80e535897de6 100644
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
@@ -50,6 +50,7 @@
 #include <linux/preempt.h>
 #include <linux/linkage.h>
 #include <linux/compiler.h>
+#include <linux/irqflags.h>
 #include <linux/thread_info.h>
 #include <linux/kernel.h>
 #include <linux/stringify.h>
author	Linus Torvalds <torvalds@linux-foundation.org>	2010-10-21 17:37:27 -0400
committer	Linus Torvalds <torvalds@linux-foundation.org>	2010-10-21 17:37:27 -0400
commit	e36f561a2c88394ef2708f1ab300fe8a79e9f651 (patch)
tree	385f378c4240955e4356d49686a8ef606a82a7c1 /include/linux
parent	70ada77920723fbc2b35e9b301022fb1e166b41b (diff)
parent	df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 (diff)

diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 96c323ac44df..8a389b608ce3 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h
@@ -8,7 +8,6 @@
8	#include <linux/lockdep.h>	8	#include <linux/lockdep.h>
9	#include <linux/ftrace_irq.h>	9	#include <linux/ftrace_irq.h>
10	#include <asm/hardirq.h>	10	#include <asm/hardirq.h>
11	#include <asm/system.h>
12		11
13	/*	12	/*
14	* We put the hardirq and softirq counter into the preemption	13	* We put the hardirq and softirq counter into the preemption


diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h index 006bf45eae30..d176d658fe25 100644 --- a/include/linux/irqflags.h +++ b/include/linux/irqflags.h
@@ -12,6 +12,7 @@
12	#define _LINUX_TRACE_IRQFLAGS_H	12	#define _LINUX_TRACE_IRQFLAGS_H
13		13
14	#include <linux/typecheck.h>	14	#include <linux/typecheck.h>
		15	#include <asm/irqflags.h>
15		16
16	#ifdef CONFIG_TRACE_IRQFLAGS	17	#ifdef CONFIG_TRACE_IRQFLAGS
17	extern void trace_softirqs_on(unsigned long ip);	18	extern void trace_softirqs_on(unsigned long ip);
@@ -52,17 +53,45 @@
52	# define start_critical_timings() do { } while (0)	53	# define start_critical_timings() do { } while (0)
53	#endif	54	#endif
54		55
55	#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT	56	/*
56		57	* Wrap the arch provided IRQ routines to provide appropriate checks.
57	#include <asm/irqflags.h>	58	*/
		59	#define raw_local_irq_disable() arch_local_irq_disable()
		60	#define raw_local_irq_enable() arch_local_irq_enable()
		61	#define raw_local_irq_save(flags) \
		62	do { \
		63	typecheck(unsigned long, flags); \
		64	flags = arch_local_irq_save(); \
		65	} while (0)
		66	#define raw_local_irq_restore(flags) \
		67	do { \
		68	typecheck(unsigned long, flags); \
		69	arch_local_irq_restore(flags); \
		70	} while (0)
		71	#define raw_local_save_flags(flags) \
		72	do { \
		73	typecheck(unsigned long, flags); \
		74	flags = arch_local_save_flags(); \
		75	} while (0)
		76	#define raw_irqs_disabled_flags(flags) \
		77	({ \
		78	typecheck(unsigned long, flags); \
		79	arch_irqs_disabled_flags(flags); \
		80	})
		81	#define raw_irqs_disabled() (arch_irqs_disabled())
		82	#define raw_safe_halt() arch_safe_halt()
58		83
		84	/*
		85	* The local_irq_() APIs are equal to the raw_local_irq()
		86	* if !TRACE_IRQFLAGS.
		87	*/
		88	#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
59	#define local_irq_enable() \	89	#define local_irq_enable() \
60	do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0)	90	do { trace_hardirqs_on(); raw_local_irq_enable(); } while (0)
61	#define local_irq_disable() \	91	#define local_irq_disable() \
62	do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)	92	do { raw_local_irq_disable(); trace_hardirqs_off(); } while (0)
63	#define local_irq_save(flags) \	93	#define local_irq_save(flags) \
64	do { \	94	do { \
65	typecheck(unsigned long, flags); \
66	raw_local_irq_save(flags); \	95	raw_local_irq_save(flags); \
67	trace_hardirqs_off(); \	96	trace_hardirqs_off(); \
68	} while (0)	97	} while (0)
@@ -70,7 +99,6 @@
70		99
71	#define local_irq_restore(flags) \	100	#define local_irq_restore(flags) \
72	do { \	101	do { \
73	typecheck(unsigned long, flags); \
74	if (raw_irqs_disabled_flags(flags)) { \	102	if (raw_irqs_disabled_flags(flags)) { \
75	raw_local_irq_restore(flags); \	103	raw_local_irq_restore(flags); \
76	trace_hardirqs_off(); \	104	trace_hardirqs_off(); \
@@ -79,51 +107,44 @@
79	raw_local_irq_restore(flags); \	107	raw_local_irq_restore(flags); \
80	} \	108	} \
81	} while (0)	109	} while (0)
82	#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */	110	#define local_save_flags(flags) \
83	/*
84	* The local_irq_() APIs are equal to the raw_local_irq()
85	* if !TRACE_IRQFLAGS.
86	*/
87	# define raw_local_irq_disable() local_irq_disable()
88	# define raw_local_irq_enable() local_irq_enable()
89	# define raw_local_irq_save(flags) \
90	do { \
91	typecheck(unsigned long, flags); \
92	local_irq_save(flags); \
93	} while (0)
94	# define raw_local_irq_restore(flags) \
95	do { \	111	do { \
96	typecheck(unsigned long, flags); \	112	raw_local_save_flags(flags); \
97	local_irq_restore(flags); \
98	} while (0)	113	} while (0)
99	#endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
100		114
101	#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT	115	#define irqs_disabled_flags(flags) \
102	#define safe_halt() \	116	({ \
103	do { \	117	raw_irqs_disabled_flags(flags); \
104	trace_hardirqs_on(); \	118	})
105	raw_safe_halt(); \
106	} while (0)
107		119
108	#define local_save_flags(flags) \	120	#define irqs_disabled() \
109	do { \	121	({ \
110	typecheck(unsigned long, flags); \	122	unsigned long _flags; \
111	raw_local_save_flags(flags); \	123	raw_local_save_flags(_flags); \
		124	raw_irqs_disabled_flags(_flags); \
		125	})
		126
		127	#define safe_halt() \
		128	do { \
		129	trace_hardirqs_on(); \
		130	raw_safe_halt(); \
112	} while (0)	131	} while (0)
113		132
114	#define irqs_disabled() \
115	({ \
116	unsigned long _flags; \
117	\
118	raw_local_save_flags(_flags); \
119	raw_irqs_disabled_flags(_flags); \
120	})
121		133
122	#define irqs_disabled_flags(flags) \	134	#else /* !CONFIG_TRACE_IRQFLAGS_SUPPORT */
123	({ \	135
124	typecheck(unsigned long, flags); \	136	#define local_irq_enable() do { raw_local_irq_enable(); } while (0)
125	raw_irqs_disabled_flags(flags); \	137	#define local_irq_disable() do { raw_local_irq_disable(); } while (0)
126	})	138	#define local_irq_save(flags) \
		139	do { \
		140	raw_local_irq_save(flags); \
		141	} while (0)
		142	#define local_irq_restore(flags) do { raw_local_irq_restore(flags); } while (0)
		143	#define local_save_flags(flags) do { raw_local_save_flags(flags); } while (0)
		144	#define irqs_disabled() (raw_irqs_disabled())
		145	#define irqs_disabled_flags(flags) (raw_irqs_disabled_flags(flags))
		146	#define safe_halt() do { raw_safe_halt(); } while (0)
		147
127	#endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */	148	#endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */
128		149
129	#endif	150	#endif


diff --git a/include/linux/list.h b/include/linux/list.h index d167b5d7c0ac..88a000617d77 100644 --- a/include/linux/list.h +++ b/include/linux/list.h
@@ -5,7 +5,6 @@
5	#include <linux/stddef.h>	5	#include <linux/stddef.h>
6	#include <linux/poison.h>	6	#include <linux/poison.h>
7	#include <linux/prefetch.h>	7	#include <linux/prefetch.h>
8	#include <asm/system.h>
9		8
10	/*	9	/*
11	* Simple doubly linked list implementation.	10	* Simple doubly linked list implementation.


diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index f8854655860e..80e535897de6 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h
@@ -50,6 +50,7 @@
50	#include <linux/preempt.h>	50	#include <linux/preempt.h>
51	#include <linux/linkage.h>	51	#include <linux/linkage.h>
52	#include <linux/compiler.h>	52	#include <linux/compiler.h>
		53	#include <linux/irqflags.h>
53	#include <linux/thread_info.h>	54	#include <linux/thread_info.h>
54	#include <linux/kernel.h>	55	#include <linux/kernel.h>
55	#include <linux/stringify.h>	56	#include <linux/stringify.h>