diff options
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 1 | ||||
-rw-r--r-- | init/do_mounts.c | 1 | ||||
-rw-r--r-- | init/initramfs.c | 2 | ||||
-rw-r--r-- | init/main.c | 1 | ||||
-rw-r--r-- | init/noinitramfs.c | 14 | ||||
-rw-r--r-- | init/version.c | 1 |
6 files changed, 6 insertions, 14 deletions
diff --git a/init/Kconfig b/init/Kconfig index 8b9ffe236e4f..36894c9fb420 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1,3 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0-only config DEFCONFIG_LIST string depends on !UML diff --git a/init/do_mounts.c b/init/do_mounts.c index f8c230c77035..2d1ea3028454 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only #include <linux/module.h> #include <linux/sched.h> #include <linux/ctype.h> diff --git a/init/initramfs.c b/init/initramfs.c index 435a428c2af1..178130fd61c2 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -669,7 +669,7 @@ done: * If the initrd region is overlapped with crashkernel reserved region, * free only memory that is not part of crashkernel region. */ - if (!do_retain_initrd && !kexec_free_initrd()) + if (!do_retain_initrd && initrd_start && !kexec_free_initrd()) free_initrd_mem(initrd_start, initrd_end); initrd_start = 0; initrd_end = 0; diff --git a/init/main.c b/init/main.c index 5a2c69b4d7b3..66a196c5e4c3 100644 --- a/init/main.c +++ b/init/main.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/init/main.c * diff --git a/init/noinitramfs.c b/init/noinitramfs.c index f4bad8436c93..fa9cdfa7101d 100644 --- a/init/noinitramfs.c +++ b/init/noinitramfs.c @@ -1,21 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * init/noinitramfs.c * * Copyright (C) 2006, NXP Semiconductors, All Rights Reserved * Author: Jean-Paul Saman <jean-paul.saman@nxp.com> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include <linux/init.h> #include <linux/stat.h> diff --git a/init/version.c b/init/version.c index ef4012ec4375..cba341161b58 100644 --- a/init/version.c +++ b/init/version.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * linux/init/version.c * |