Commit 69b3a5ac authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck

[IA64] remove dead wood from asm-ia64/hardirq.h

syscall_count, ksoftirqd_task, local_syscall_count, local_ksoftirqd_task
and local_nmi_count are totally unused (and gone from other
architectures aswell)

nmi_count() is a stub only used once in arch/ia64/kernel/irq.c, so we
can use 0 directly there.  I suspect it was added to keep irq.c in sync
with i386, but even the CONFIG_GENERIC_HARDIRQS code (<hint>which IA64
needs to be converted to</hint>) leaves /proc/interrupts output to the
architecture because it's so different over the architectures.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>

Deleted the code to print "NMI:" and a row of zeroes from irq.c -Tony
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent f47da87f
...@@ -215,11 +215,6 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -215,11 +215,6 @@ int show_interrupts(struct seq_file *p, void *v)
skip: skip:
spin_unlock_irqrestore(&idesc->lock, flags); spin_unlock_irqrestore(&idesc->lock, flags);
} else if (i == NR_IRQS) { } else if (i == NR_IRQS) {
seq_puts(p, "NMI: ");
for (j = 0; j < NR_CPUS; j++)
if (cpu_online(j))
seq_printf(p, "%10u ", nmi_count(j));
seq_putc(p, '\n');
#ifdef CONFIG_X86_LOCAL_APIC #ifdef CONFIG_X86_LOCAL_APIC
seq_puts(p, "LOC: "); seq_puts(p, "LOC: ");
for (j = 0; j < NR_CPUS; j++) for (j = 0; j < NR_CPUS; j++)
......
...@@ -20,14 +20,7 @@ ...@@ -20,14 +20,7 @@
#define __ARCH_IRQ_STAT 1 #define __ARCH_IRQ_STAT 1
#define softirq_pending(cpu) (cpu_data(cpu)->softirq_pending) #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_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
#define HARDIRQ_BITS 14 #define HARDIRQ_BITS 14
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment