X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-ia64%2Fhardirq.h;h=33ef8f096d953e4a1c8307938cd029e7728458c3;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=491996a792514c0b60b322ace12d70256f5151e3;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/include/asm-ia64/hardirq.h b/include/asm-ia64/hardirq.h
index 491996a79..33ef8f096 100644
--- a/include/asm-ia64/hardirq.h
+++ b/include/asm-ia64/hardirq.h
@@ -19,39 +19,10 @@
 
 #define __ARCH_IRQ_STAT	1
 
-#define softirq_pending(cpu)		(cpu_data(cpu)->softirq_pending)
-#define syscall_count(cpu)		/* unused on IA-64 */
-#define ksoftirqd_task(cpu)		(cpu_data(cpu)->ksoftirqd)
-#define nmi_count(cpu)			0
-
 #define local_softirq_pending()		(local_cpu_data->softirq_pending)
-#define local_syscall_count()		/* unused on IA-64 */
-#define local_ksoftirqd_task()		(local_cpu_data->ksoftirqd)
-#define local_nmi_count()		0
-
-/*
- * We put the hardirq and softirq counter into the preemption counter. The bitmask has the
- * following meaning:
- *
- * - bits 0-7 are the preemption count (max preemption depth: 256)
- * - bits 8-15 are the softirq count (max # of softirqs: 256)
- * - bits 16-29 are the hardirq count (max # of hardirqs: 16384)
- *
- * - (bit 63 is the PREEMPT_ACTIVE flag---not currently implemented.)
- *
- * PREEMPT_MASK: 0x000000ff
- * SOFTIRQ_MASK: 0x0000ff00
- * HARDIRQ_MASK: 0x3fff0000
- */
 
-#define PREEMPT_BITS	8
-#define SOFTIRQ_BITS	8
 #define HARDIRQ_BITS	14
 
-#define PREEMPT_SHIFT	0
-#define SOFTIRQ_SHIFT	(PREEMPT_SHIFT + PREEMPT_BITS)
-#define HARDIRQ_SHIFT	(SOFTIRQ_SHIFT + SOFTIRQ_BITS)
-
 /*
  * The hardirq mask has to be large enough to have space for potentially all IRQ sources
  * in the system nesting on a single CPU:
@@ -62,4 +33,6 @@
 
 extern void __iomem *ipi_base_addr;
 
+void ack_bad_irq(unsigned int irq);
+
 #endif /* _ASM_IA64_HARDIRQ_H */