diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-22 03:06:21 -0400 |
commit | 76c3bb15d6786a0b8da0ad0090e0c9c3672fc08b (patch) | |
tree | 3824e008db9d554229a70c85fbbc13238276bd7a /include/asm-sparc64/hardirq.h | |
parent | 7be42004065ce4df193aeef5befd26805267d0d9 (diff) | |
parent | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (diff) |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'include/asm-sparc64/hardirq.h')
-rw-r--r-- | include/asm-sparc64/hardirq.h | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/include/asm-sparc64/hardirq.h b/include/asm-sparc64/hardirq.h index 7c29fd1a87aa..63dca3db11f3 100644 --- a/include/asm-sparc64/hardirq.h +++ b/include/asm-sparc64/hardirq.h | |||
@@ -1,19 +1 @@ | |||
1 | /* hardirq.h: 64-bit Sparc hard IRQ support. | #include <asm-sparc/hardirq.h> | |
2 | * | ||
3 | * Copyright (C) 1997, 1998, 2005 David S. Miller (davem@davemloft.net) | ||
4 | */ | ||
5 | |||
6 | #ifndef __SPARC64_HARDIRQ_H | ||
7 | #define __SPARC64_HARDIRQ_H | ||
8 | |||
9 | #include <asm/cpudata.h> | ||
10 | |||
11 | #define __ARCH_IRQ_STAT | ||
12 | #define local_softirq_pending() \ | ||
13 | (local_cpu_data().__softirq_pending) | ||
14 | |||
15 | void ack_bad_irq(unsigned int irq); | ||
16 | |||
17 | #define HARDIRQ_BITS 8 | ||
18 | |||
19 | #endif /* !(__SPARC64_HARDIRQ_H) */ | ||