- 4.14.176

[packages/kernel.git] / kernel-small_fixes.patch

diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index 561fe81d0a38159e4cbd2b0730454f5144661cf9..a227229931d63172b9dc579d98a0799465ecca09 100644 (file)
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,30 +26,18 @@
                                exit
                        fi
                done
---- a/arch/x86/kernel/acpi/boot.c
-+++ b/arch/x86/kernel/acpi/boot.c
-@@ -604,14 +604,18 @@ void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
+--- linux-4.14/security/selinux/include/classmap.h     2017-11-12 19:46:13.000000000 +0100
++++ linux-4.20/security/selinux/include/classmap.h     2018-12-24 00:55:59.000000000 +0100
+@@ -238,9 +238,11 @@
+         { "access", NULL } },
+       { "infiniband_endport",
+         { "manage_subnet", NULL } },
++      { "xdp_socket",
++        { COMMON_SOCK_PERMS, NULL } },
+       { NULL }
+   };
  
- int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
- {
--      int irq = mp_map_gsi_to_irq(gsi, IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
-+      int irq;
- 
--      if (irq >= 0) {
-+      if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
-+              *irqp = gsi;
-+      } else {
-+              irq = mp_map_gsi_to_irq(gsi,
-+                                      IOAPIC_MAP_ALLOC | IOAPIC_MAP_CHECK);
-+              if (irq < 0)
-+                      return -1;
-               *irqp = irq;
--              return 0;
-       }
--
--      return -1;
-+      return 0;
- }
- EXPORT_SYMBOL_GPL(acpi_gsi_to_irq);
- 
--- 
+-#if PF_MAX > 44
++#if PF_MAX > 45
+ #error New address family defined, please update secclass_map.
+ #endif