diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-22 17:44:23 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-02-22 17:44:23 +0100 |
commit | 8f060f53554cf58dcb28c85ff05d03ed8b02f4b2 (patch) | |
tree | bba474bccdc99e46fe11e3867f2ddbde7353d69f /arch/s390/kernel | |
parent | a242010776f880ec0d8917aae0406e4a70cdc36c (diff) | |
parent | 11ba5961a2156a4f210627ed8421387e2531b100 (diff) | |
download | linux-8f060f53554cf58dcb28c85ff05d03ed8b02f4b2.tar.gz linux-8f060f53554cf58dcb28c85ff05d03ed8b02f4b2.tar.bz2 linux-8f060f53554cf58dcb28c85ff05d03ed8b02f4b2.zip |
Merge tag 'kvm-s390-next-5.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-next
KVM: s390: Features for 5.1
- Clarify KVM related kernel messages
- Interrupt cleanup
- Introduction of the Guest Information Block (GIB)
- Preparation for processor subfunctions in cpu model
Diffstat (limited to 'arch/s390/kernel')
-rw-r--r-- | arch/s390/kernel/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index 0e8d68bac82c..0cd5a5f96729 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c @@ -88,6 +88,7 @@ static const struct irq_class irqclass_sub_desc[] = { {.irq = IRQIO_MSI, .name = "MSI", .desc = "[I/O] MSI Interrupt" }, {.irq = IRQIO_VIR, .name = "VIR", .desc = "[I/O] Virtual I/O Devices"}, {.irq = IRQIO_VAI, .name = "VAI", .desc = "[I/O] Virtual I/O Devices AI"}, + {.irq = IRQIO_GAL, .name = "GAL", .desc = "[I/O] GIB Alert"}, {.irq = NMI_NMI, .name = "NMI", .desc = "[NMI] Machine Check"}, {.irq = CPU_RST, .name = "RST", .desc = "[CPU] CPU Restart"}, }; |