s390/irq: use CR0 defines to define CR0_IRQ_SUBCLASS_MASK

Use existing CR0 defines to define CR0_IRQ_SUBCLASS_MASK instead of
open-coding the defines again.

Reviewed-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 89902f7547402ecb2cbcc30dce89ef5ffec0b9c1..54b42817f70a65718d0111e5d7edc9ef04583432 100644 (file)
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -31,6 +31,7 @@
 #include <linux/percpu.h>
 #include <linux/cache.h>
 #include <linux/types.h>
+#include <asm/ctlreg.h>
 
 enum interruption_class {
        IRQEXT_CLK,
@@ -101,17 +102,17 @@ enum irq_subclass {
 };
 
 #define CR0_IRQ_SUBCLASS_MASK                                    \
-       ((1UL << (63 - 30))  /* Warning Track */                | \
-        (1UL << (63 - 48))  /* Malfunction Alert */            | \
-        (1UL << (63 - 49))  /* Emergency Signal */             | \
-        (1UL << (63 - 50))  /* External Call */                | \
-        (1UL << (63 - 52))  /* Clock Comparator */             | \
-        (1UL << (63 - 53))  /* CPU Timer */                    | \
-        (1UL << (63 - 54))  /* Service Signal */               | \
-        (1UL << (63 - 57))  /* Interrupt Key */                | \
-        (1UL << (63 - 58))  /* Measurement Alert */            | \
-        (1UL << (63 - 59))  /* Timing Alert */                 | \
-        (1UL << (63 - 62))) /* IUCV */
+       (CR0_WARNING_TRACK                                      | \
+        CR0_MALFUNCTION_ALERT_SUBMASK                          | \
+        CR0_EMERGENCY_SIGNAL_SUBMASK                           | \
+        CR0_EXTERNAL_CALL_SUBMASK                              | \
+        CR0_CLOCK_COMPARATOR_SUBMASK                           | \
+        CR0_CPU_TIMER_SUBMASK                                  | \
+        CR0_SERVICE_SIGNAL_SUBMASK                             | \
+        CR0_INTERRUPT_KEY_SUBMASK                              | \
+        CR0_MEASUREMENT_ALERT_SUBMASK                          | \
+        CR0_ETR_SUBMASK                                        | \
+        CR0_IUCV)
 
 void irq_subclass_register(enum irq_subclass subclass);
 void irq_subclass_unregister(enum irq_subclass subclass);