diff options
author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 09:03:36 -0500 |
---|---|---|
committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-07-28 09:03:36 -0500 |
commit | da28c12089dfcfb8695b6b555cdb8e03dda2b690 (patch) | |
tree | b3ff509f21352ef053cb3d490cb13528090d32ac /include/asm-cris/hardirq.h | |
parent | 6de7dc2c4c713d037c19aa1e310d240f16973414 (diff) | |
parent | 577a4f8102d54b504cb22eb021b89e957e8df18f (diff) | |
download | op-kernel-dev-da28c12089dfcfb8695b6b555cdb8e03dda2b690.zip op-kernel-dev-da28c12089dfcfb8695b6b555cdb8e03dda2b690.tar.gz |
Merge with /home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
/home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
Diffstat (limited to 'include/asm-cris/hardirq.h')
-rw-r--r-- | include/asm-cris/hardirq.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-cris/hardirq.h b/include/asm-cris/hardirq.h index f4d1362..1c13dd3 100644 --- a/include/asm-cris/hardirq.h +++ b/include/asm-cris/hardirq.h @@ -1,18 +1,17 @@ #ifndef __ASM_HARDIRQ_H #define __ASM_HARDIRQ_H -/* only non-SMP supported */ - #include <linux/threads.h> #include <linux/cache.h> -/* entry.S is sensitive to the offsets of these fields */ typedef struct { unsigned int __softirq_pending; } ____cacheline_aligned irq_cpustat_t; #include <linux/irq_cpustat.h> /* Standard mappings for irq_cpustat_t above */ +void ack_bad_irq(unsigned int irq); + #define HARDIRQ_BITS 8 /* |