aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/patches-4.9
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-01 11:23:21 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-07 17:30:35 +0100
commit92bda4ae5c6aac89e612c338bf9e9e6e9ee96aca (patch)
treeddba3851a3b10bd37b9f92504ad8cd1b74256dd1 /target/linux/x86/patches-4.9
parentf55c29e4c74353ef0795eb83911c708c6db90466 (diff)
downloadupstream-92bda4ae5c6aac89e612c338bf9e9e6e9ee96aca.tar.gz
upstream-92bda4ae5c6aac89e612c338bf9e9e6e9ee96aca.tar.bz2
upstream-92bda4ae5c6aac89e612c338bf9e9e6e9ee96aca.zip
x86: switch to Linux 4.9
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/x86/patches-4.9')
-rw-r--r--target/linux/x86/patches-4.9/011-tune_lzma_options.patch22
-rw-r--r--target/linux/x86/patches-4.9/100-fix_cs5535_clockevt.patch12
2 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/x86/patches-4.9/011-tune_lzma_options.patch b/target/linux/x86/patches-4.9/011-tune_lzma_options.patch
new file mode 100644
index 0000000000..4fb7943cb7
--- /dev/null
+++ b/target/linux/x86/patches-4.9/011-tune_lzma_options.patch
@@ -0,0 +1,22 @@
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -344,7 +344,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 */
+ # define BOOT_HEAP_SIZE 0x10000
diff --git a/target/linux/x86/patches-4.9/100-fix_cs5535_clockevt.patch b/target/linux/x86/patches-4.9/100-fix_cs5535_clockevt.patch
new file mode 100644
index 0000000000..c49ddca7d6
--- /dev/null
+++ b/target/linux/x86/patches-4.9/100-fix_cs5535_clockevt.patch
@@ -0,0 +1,12 @@
+--- a/drivers/clocksource/cs5535-clockevt.c
++++ b/drivers/clocksource/cs5535-clockevt.c
+@@ -129,7 +129,8 @@ static irqreturn_t mfgpt_tick(int irq, v
+ cs5535_mfgpt_write(cs5535_event_clock, MFGPT_REG_SETUP,
+ MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
+
+- cs5535_clockevent.event_handler(&cs5535_clockevent);
++ if (cs5535_clockevent.event_handler)
++ cs5535_clockevent.event_handler(&cs5535_clockevent);
+ return IRQ_HANDLED;
+ }
+