diff options
| author | Stijn Segers <foss@volatilesystems.org> | 2018-06-29 22:29:06 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2018-07-02 07:06:23 +0200 |
| commit | ab7cabd09df542cf3558725573c2ef2cf1c7cdff (patch) | |
| tree | 791b3f74b7c5e60f1409836871287337f4cf0e38 /target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch | |
| parent | c96b344466fc80cb5815eeab87c6ca9a29fb9207 (diff) | |
| download | upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.gz upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.bz2 upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.zip | |
kernel: bump 4.14 to 4.14.52 for 18.06
Compile-tested on: ramips/mt7621, x86/64.
Run-tested on: ramips/mt7621.
Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch')
| -rw-r--r-- | target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch index 7a4dce7502..85947b1974 100644 --- a/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch +++ b/target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch @@ -157,7 +157,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> } --- a/init/main.c +++ b/init/main.c -@@ -96,6 +96,10 @@ +@@ -95,6 +95,10 @@ #include <asm/sections.h> #include <asm/cacheflush.h> @@ -168,7 +168,7 @@ Signed-off-by: Adrian Panella <ianchi74@outlook.com> static int kernel_init(void *); extern void init_IRQ(void); -@@ -575,6 +579,18 @@ asmlinkage __visible void __init start_k +@@ -574,6 +578,18 @@ asmlinkage __visible void __init start_k page_alloc_init(); pr_notice("Kernel command line: %s\n", boot_command_line); |