From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de ([195.135.220.15]:57906 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726628AbfGLRVM (ORCPT ); Fri, 12 Jul 2019 13:21:12 -0400 From: Petr Tesarik Subject: [PATCH 1/2] init: Separate banner from init_uts_ns Date: Fri, 12 Jul 2019 19:21:00 +0200 Message-Id: In-Reply-To: References: Sender: linux-s390-owner@vger.kernel.org List-ID: To: Heiko Carstens , Vasily Gorbik , Christian Borntraeger , Martin Schwidefsky , Philipp Rudo , Masahiro Yamada , Greg Kroah-Hartman , Laura Abbott , Thomas Gleixner Cc: Petr Tesarik , linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org The Linux banner is self-contained, so it could be theoretically added to separately linked binaries (e.g. the kernel decompressor). Unfortunately, it lives in the same object file as init_uts_ns, which needs additional symbols from other object files. Let's divorce the two. Signed-off-by: Petr Tesarik --- init/Makefile | 2 +- init/banner.c | 21 +++++++++++++++++++++ init/version.c | 10 ---------- 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 init/banner.c diff --git a/init/Makefile b/init/Makefile index a3e5ce2bcf08..5009ea808ce4 100644 --- a/init/Makefile +++ b/init/Makefile @@ -5,7 +5,7 @@ ccflags-y := -fno-function-sections -fno-data-sections -obj-y := main.o version.o mounts.o +obj-y := main.o version.o banner.o mounts.o ifneq ($(CONFIG_BLK_DEV_INITRD),y) obj-y += noinitramfs.o else diff --git a/init/banner.c b/init/banner.c new file mode 100644 index 000000000000..653ee081d474 --- /dev/null +++ b/init/banner.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * linux/init/banner.c + * + * Copyright (C) 1992 Theodore Ts'o + * + * May be freely distributed as part of Linux. + */ + +#include +#include + +/* FIXED STRINGS! Don't touch! */ +const char linux_banner[] = + "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" + LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; + +const char linux_proc_banner[] = + "%s version %s" + " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")" + " (" LINUX_COMPILER ") %s\n"; diff --git a/init/version.c b/init/version.c index cba341161b58..989cf9f9fe2c 100644 --- a/init/version.c +++ b/init/version.c @@ -42,14 +42,4 @@ struct uts_namespace init_uts_ns = { }; EXPORT_SYMBOL_GPL(init_uts_ns); -/* FIXED STRINGS! Don't touch! */ -const char linux_banner[] = - "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@" - LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n"; - -const char linux_proc_banner[] = - "%s version %s" - " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")" - " (" LINUX_COMPILER ") %s\n"; - BUILD_SALT; -- 2.16.4