git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
asm-frv
/
hardirq.h
diff --git
a/include/asm-frv/hardirq.h
b/include/asm-frv/hardirq.h
index
6851239
..
fc47515
100644
(file)
--- a/
include/asm-frv/hardirq.h
+++ b/
include/asm-frv/hardirq.h
@@
-12,7
+12,6
@@
#ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H
#ifndef __ASM_HARDIRQ_H
#define __ASM_HARDIRQ_H
-#include <linux/config.h>
#include <linux/threads.h>
#include <linux/irq.h>
#include <linux/threads.h>
#include <linux/irq.h>
@@
-27,5
+26,10
@@
typedef struct {
#error SMP not available on FR-V
#endif /* CONFIG_SMP */
#error SMP not available on FR-V
#endif /* CONFIG_SMP */
+extern atomic_t irq_err_count;
+static inline void ack_bad_irq(int irq)
+{
+ atomic_inc(&irq_err_count);
+}
#endif
#endif