diff --git a/[refs] b/[refs] index eabdc7fbf738..38d38cc4f3f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3135e0c40c9a13ad0c57783f2b9569c4c00bd26 +refs/heads/master: 275c340941991a925969c03ec6b900fd135d09dd diff --git a/trunk/arch/s390/include/asm/hardirq.h b/trunk/arch/s390/include/asm/hardirq.h index 89ec7056da28..498bc3892385 100644 --- a/trunk/arch/s390/include/asm/hardirq.h +++ b/trunk/arch/s390/include/asm/hardirq.h @@ -18,13 +18,6 @@ #include #include -/* irq_cpustat_t is unused currently, but could be converted - * into a percpu variable instead of storing softirq_pending - * on the lowcore */ -typedef struct { - unsigned int __softirq_pending; -} irq_cpustat_t; - #define local_softirq_pending() (S390_lowcore.softirq_pending) #define __ARCH_IRQ_STAT