[X][SRU][PATCH] CONFIG_LOG_BUF_SHIFT set to 14 is too low on arm64

[Dan Streetman]

From: Dan Streetman <ddstreet at canonical.com>

BugLink: https://bugs.launchpad.net/bugs/1824864

All other archs have this value set higher, and the low value of 14
results in a log buffer so small it fills up before systemd-journald
can start and read all the boot time kernel log messages.

Increasing this will result in more memory reserved for the log buffer,
but will avoid missed kernel log messages.

This changes all 64 bit archs to use a shift of 18, which is what
amd64 has been using.

Signed-off-by: Dan Streetman <ddstreet at canonical.com>
Cc: Dimitri John Ledkov <xnox at ubuntu.com>
---

@xnox opened this bug and submitted a patch for disco, but not earlier kernels.

 debian.master/config/annotations                   | 2 +-
 debian.master/config/arm64/config.common.arm64     | 2 +-
 debian.master/config/powerpc/config.common.powerpc | 2 +-
 debian.master/config/ppc64el/config.common.ppc64el | 2 +-
 debian.master/config/s390x/config.common.s390x     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index 17634a26dfb63..adb84bb850ddf 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -7667,7 +7667,7 @@ CONFIG_USELIB                                   policy<{'amd64': 'y', 'arm64': '
 CONFIG_AUDIT                                    policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_AUDITSYSCALL                             policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'i386': 'y', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_IKCONFIG                                 policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '14', 'armhf': '17', 'i386': '17', 'powerpc': '17', 'ppc64el': '17', 's390x': '17'}>
+CONFIG_LOG_BUF_SHIFT                            policy<{'amd64': '18', 'arm64': '18', 'armhf': '17', 'i386': '17', 'powerpc': '18', 'ppc64el': '18', 's390x': '18'}>
 CONFIG_LOG_CPU_MAX_BUF_SHIFT                    policy<{'amd64': '12', 'arm64': '12', 'armhf': '12', 'i386': '12', 'powerpc': '12', 'ppc64el': '12', 's390x': '12'}>
 CONFIG_NUMA_BALANCING                           policy<{'amd64': 'y', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y'}>
 CONFIG_NUMA_BALANCING_DEFAULT_ENABLED           policy<{'amd64': 'y', 'powerpc-powerpc64-smp': 'y', 'ppc64el': 'y', 's390x': 'n'}>
diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64
index 6f3fa32e681af..d0b7886ee52b6 100644
--- a/debian.master/config/arm64/config.common.arm64
+++ b/debian.master/config/arm64/config.common.arm64
@@ -169,7 +169,7 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-CONFIG_LOG_BUF_SHIFT=14
+CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
 CONFIG_MAC_PARTITION=y
diff --git a/debian.master/config/powerpc/config.common.powerpc b/debian.master/config/powerpc/config.common.powerpc
index 7ea3cf07820ac..5e9e5b68dc6ce 100644
--- a/debian.master/config/powerpc/config.common.powerpc
+++ b/debian.master/config/powerpc/config.common.powerpc
@@ -153,7 +153,7 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_LPARCFG is not set
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
diff --git a/debian.master/config/ppc64el/config.common.ppc64el b/debian.master/config/ppc64el/config.common.ppc64el
index 146a0e3e755ff..9dbff52441fad 100644
--- a/debian.master/config/ppc64el/config.common.ppc64el
+++ b/debian.master/config/ppc64el/config.common.ppc64el
@@ -174,7 +174,7 @@ CONFIG_LAPB=m
 CONFIG_LDM_PARTITION=y
 CONFIG_LIBNVDIMM=y
 CONFIG_LLC2=m
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 CONFIG_LPARCFG=y
 CONFIG_LPC_ICH=m
 CONFIG_LPC_SCH=m
diff --git a/debian.master/config/s390x/config.common.s390x b/debian.master/config/s390x/config.common.s390x
index 9e180b06e77c0..a3be5b1ba7497 100644
--- a/debian.master/config/s390x/config.common.s390x
+++ b/debian.master/config/s390x/config.common.s390x
@@ -139,7 +139,7 @@ CONFIG_KVM=y
 # CONFIG_LDM_PARTITION is not set
 # CONFIG_LIBNVDIMM is not set
 # CONFIG_LLC2 is not set
-CONFIG_LOG_BUF_SHIFT=17
+CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_LPC_ICH is not set
 # CONFIG_LPC_SCH is not set
 # CONFIG_MAC_PARTITION is not set
-- 
2.20.1