diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-18 13:10:43 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2016-03-18 13:10:43 -0400 |
commit | 1dea4eb579f8656449b31372767cfb5910b16ba3 (patch) | |
tree | 355497c8f96ebbf33068234af9618554efff900c /arm64-avoid-needing-console-to-enable-serial-console.patch | |
parent | 8b7fda18c9ae7c1c5fc3be129f52798752a3bf24 (diff) | |
download | kernel-1dea4eb579f8656449b31372767cfb5910b16ba3.tar.gz kernel-1dea4eb579f8656449b31372767cfb5910b16ba3.tar.xz kernel-1dea4eb579f8656449b31372767cfb5910b16ba3.zip |
Linux v4.5-4071-g10fdfee7f7fd
- input, livepatching, trivial, hid, gpio, m68knommu, arm64, selftest merges
Diffstat (limited to 'arm64-avoid-needing-console-to-enable-serial-console.patch')
-rw-r--r-- | arm64-avoid-needing-console-to-enable-serial-console.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arm64-avoid-needing-console-to-enable-serial-console.patch b/arm64-avoid-needing-console-to-enable-serial-console.patch index e8cc7bbe0..3c639a0a3 100644 --- a/arm64-avoid-needing-console-to-enable-serial-console.patch +++ b/arm64-avoid-needing-console-to-enable-serial-console.patch @@ -1,4 +1,4 @@ -From ede02df9a481ba07348e6fd4393ba2e273ef16d8 Mon Sep 17 00:00:00 2001 +From ce7a9e482dcf66d155e74b39ada1708cf6d9cb25 Mon Sep 17 00:00:00 2001 From: Mark Salter <msalter@redhat.com> Date: Wed, 25 Mar 2015 14:17:50 -0400 Subject: [PATCH] arm64: avoid needing console= to enable serial console @@ -11,17 +11,17 @@ firmware. Signed-off-by: Mark Salter <msalter@redhat.com> --- - arch/arm64/kernel/setup.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + arch/arm64/kernel/setup.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c -index 8119479..ea9ff80 100644 +index 9dc67769b6a4..dfac33b47423 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c -@@ -381,3 +381,22 @@ static int __init topology_init(void) +@@ -417,3 +417,22 @@ static int __init register_kernel_offset_dumper(void) return 0; } - subsys_initcall(topology_init); + __initcall(register_kernel_offset_dumper); + +/* + * Temporary hack to avoid need for console= on command line |