* [PATCH net-next 0/1] s390: patch for net-next
@ 2015-03-25 15:31 Ursula Braun
2015-03-25 15:31 ` [PATCH net-next 1/1] s390: fix /proc/interrupts output Ursula Braun
0 siblings, 1 reply; 3+ messages in thread
From: Ursula Braun @ 2015-03-25 15:31 UTC (permalink / raw)
To: davem; +Cc: netdev, linux-s390, ursula.braun, ubraun
From: Ursula Braun <ursula.braun@de.ibm.com>
Hi Dave,
here is a remaining patch for net-next I have forgotten when removing
the claw driver
shortlog:
Sebastian Ott (1)
s390: fix /proc/interrupts output
Thanks,
Ursula
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH net-next 1/1] s390: fix /proc/interrupts output
2015-03-25 15:31 [PATCH net-next 0/1] s390: patch for net-next Ursula Braun
@ 2015-03-25 15:31 ` Ursula Braun
2015-03-25 15:42 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Ursula Braun @ 2015-03-25 15:31 UTC (permalink / raw)
To: davem
Cc: netdev, linux-s390, ursula.braun, ubraun, Sebastian Ott,
Martin Schwidefsky
From: Sebastian Ott <sebott@linux.vnet.ibm.com>
The irqclass_sub_desc array and enum interruption_class are out of sync
thus /proc/interrupts is broken. Remove IRQIO_CLW.
Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
---
arch/s390/include/asm/irq.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 343ea7c..ff95d15 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -57,7 +57,6 @@ enum interruption_class {
IRQIO_TAP,
IRQIO_VMR,
IRQIO_LCS,
- IRQIO_CLW,
IRQIO_CTC,
IRQIO_APB,
IRQIO_ADM,
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next 1/1] s390: fix /proc/interrupts output
2015-03-25 15:31 ` [PATCH net-next 1/1] s390: fix /proc/interrupts output Ursula Braun
@ 2015-03-25 15:42 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2015-03-25 15:42 UTC (permalink / raw)
To: ubraun; +Cc: netdev, linux-s390, ursula.braun, sebott, schwidefsky
From: Ursula Braun <ubraun@linux.vnet.ibm.com>
Date: Wed, 25 Mar 2015 16:31:37 +0100
> From: Sebastian Ott <sebott@linux.vnet.ibm.com>
>
> The irqclass_sub_desc array and enum interruption_class are out of sync
> thus /proc/interrupts is broken. Remove IRQIO_CLW.
>
> Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-03-25 15:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-03-25 15:31 [PATCH net-next 0/1] s390: patch for net-next Ursula Braun
2015-03-25 15:31 ` [PATCH net-next 1/1] s390: fix /proc/interrupts output Ursula Braun
2015-03-25 15:42 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox