From 2172d7dbbfe453ea81ebf0b4e62d8101a7d5d1f0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 12 Jan 2016 10:04:55 +0000 Subject: x86: update to linux 4.4 Signed-off-by: Felix Fietkau SVN-Revision: 48216 --- .../x86/patches-3.18/011-tune_lzma_options.patch | 22 ---------------------- .../120-panic_on_unrecovered_nmi.patch | 11 ----------- 2 files changed, 33 deletions(-) delete mode 100644 target/linux/x86/patches-3.18/011-tune_lzma_options.patch delete mode 100644 target/linux/x86/patches-3.18/120-panic_on_unrecovered_nmi.patch (limited to 'target/linux/x86/patches-3.18') diff --git a/target/linux/x86/patches-3.18/011-tune_lzma_options.patch b/target/linux/x86/patches-3.18/011-tune_lzma_options.patch deleted file mode 100644 index cea644da10..0000000000 --- a/target/linux/x86/patches-3.18/011-tune_lzma_options.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/scripts/Makefile.lib -+++ b/scripts/Makefile.lib -@@ -325,7 +325,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) - - quiet_cmd_lzma = LZMA $@ - cmd_lzma = (cat $(filter-out FORCE,$^) | \ -- lzma e -d20 -lc1 -lp2 -pb2 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ -+ lzma e -lc8 -eos -si -so && $(call size_append, $(filter-out FORCE,$^))) > $@ || \ - (rm -f $@ ; false) - - quiet_cmd_lzo = LZO $@ ---- a/arch/x86/include/asm/boot.h -+++ b/arch/x86/include/asm/boot.h -@@ -23,7 +23,7 @@ - #error "Invalid value for CONFIG_PHYSICAL_ALIGN" - #endif - --#ifdef CONFIG_KERNEL_BZIP2 -+#if defined(CONFIG_KERNEL_BZIP2) || defined(CONFIG_KERNEL_LZMA) - #define BOOT_HEAP_SIZE 0x400000 - #else /* !CONFIG_KERNEL_BZIP2 */ - diff --git a/target/linux/x86/patches-3.18/120-panic_on_unrecovered_nmi.patch b/target/linux/x86/patches-3.18/120-panic_on_unrecovered_nmi.patch deleted file mode 100644 index 0432686cf1..0000000000 --- a/target/linux/x86/patches-3.18/120-panic_on_unrecovered_nmi.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/drivers/mfd/rdc321x-southbridge.c -+++ b/drivers/mfd/rdc321x-southbridge.c -@@ -85,6 +85,8 @@ static int rdc321x_sb_probe(struct pci_d - rdc321x_gpio_pdata.sb_pdev = pdev; - rdc321x_wdt_pdata.sb_pdev = pdev; - -+ panic_on_unrecovered_nmi = 1; -+ - return mfd_add_devices(&pdev->dev, -1, - rdc321x_sb_cells, ARRAY_SIZE(rdc321x_sb_cells), - NULL, 0, NULL); -- cgit v1.2.3