1d2590f838
Refresh patches Fixes: CVE-2017-5754 aka Meltdown Tested-on: ar71xx Archer C7 v2 Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com> [fix conflict after 4.14 bump] Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
19 lines
497 B
Diff
19 lines
497 B
Diff
--- a/arch/x86/kernel/reboot.c
|
|
+++ b/arch/x86/kernel/reboot.c
|
|
@@ -447,6 +447,16 @@ static struct dmi_system_id __initdata r
|
|
},
|
|
},
|
|
|
|
+ /* PC Engines */
|
|
+ { /* Handle problems with rebooting on PC Engines apu2 */
|
|
+ .callback = set_pci_reboot,
|
|
+ .ident = "PC Engines apu2",
|
|
+ .matches = {
|
|
+ DMI_MATCH(DMI_BOARD_VENDOR, "PC Engines"),
|
|
+ DMI_MATCH(DMI_BOARD_NAME, "apu2"),
|
|
+ },
|
|
+ },
|
|
+
|
|
/* Sony */
|
|
{ /* Handle problems with rebooting on Sony VGN-Z540N */
|
|
.callback = set_bios_reboot,
|