From 48fb994c74c2f018525c2e15b7b2481176500e09 Mon Sep 17 00:00:00 2001 From: Will McVicker Date: Wed, 22 Apr 2020 10:58:07 -0700 Subject: [PATCH] Revert "ANDROID: GKI: Make linux_banner a C pointer" This reverts commit fdef3b72107985ff7d5478d4025cbadd1b13f751. This breaks ramdump parsing. Bug: 154586724 Test: compile Change-Id: Ia91f3e0d0a0cc67947081a73bdc61670f3a25185 Signed-off-by: Will McVicker --- include/linux/printk.h | 2 +- init/version.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index 5a8ef10b4492..cf3eccfe1543 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -8,7 +8,7 @@ #include #include -extern const char *linux_banner; +extern const char linux_banner[]; extern const char linux_proc_banner[]; #define PRINTK_MAX_SINGLE_HEADER_LEN 2 diff --git a/init/version.c b/init/version.c index 9cbe50e3dfc4..61bcdf3c00a1 100644 --- a/init/version.c +++ b/init/version.c @@ -42,7 +42,7 @@ struct uts_namespace init_uts_ns = { EXPORT_SYMBOL_GPL(init_uts_ns); /* FIXED STRINGS! Don't touch! */ -const char *linux_banner = +const char linux_banner[] = "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; EXPORT_SYMBOL_GPL(linux_banner);