Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 26 Jun 2019 07:07:08 -0700
From:   tip-bot for Tiezhu Yang <tipbot@zytor.com>
Message-ID: <tip-53b7607382b0b99d6ae1ef5b1b0fa042b00ac7f4@git.kernel.org>
Cc:     mingo@kernel.org, tglx@linutronix.de, dyoung@redhat.com,
        kernelpatch@126.com, vgoyal@redhat.com,
        linux-kernel@vger.kernel.org, hpa@zytor.com
Reply-To: hpa@zytor.com, linux-kernel@vger.kernel.org, vgoyal@redhat.com,
          tglx@linutronix.de, kernelpatch@126.com, dyoung@redhat.com,
          mingo@kernel.org
In-Reply-To: <117ef0c6.3d30.16b87c9cfbf.Coremail.kernelpatch@126.com>
References: <117ef0c6.3d30.16b87c9cfbf.Coremail.kernelpatch@126.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/cleanups] x86/kexec: Make variable static and config
 dependent
Git-Commit-ID: 53b7607382b0b99d6ae1ef5b1b0fa042b00ac7f4
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  53b7607382b0b99d6ae1ef5b1b0fa042b00ac7f4
Gitweb:     https://git.kernel.org/tip/53b7607382b0b99d6ae1ef5b1b0fa042b00ac7f4
Author:     Tiezhu Yang <kernelpatch@126.com>
AuthorDate: Mon, 24 Jun 2019 12:41:18 +0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Wed, 26 Jun 2019 16:02:45 +0200

x86/kexec: Make variable static and config dependent

The following sparse warning is emitted:

  arch/x86/kernel/crash.c:59:15:
  warning: symbol 'crash_zero_bytes' was not declared. Should it be static?

The variable is only used in this compilation unit, but it is also only
used when CONFIG_KEXEC_FILE is enabled. Just making it static would result
in a 'defined but not used' warning for CONFIG_KEXEC_FILE=n.

Make it static and move it into the existing CONFIG_KEXEC_FILE section.

[ tglx: Massaged changelog and moved it into the existing ifdef ]

Fixes: dd5f726076cc ("kexec: support for kexec on panic using new system call")
Signed-off-by: Tiezhu Yang <kernelpatch@126.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Dave Young <dyoung@redhat.com>
Cc: bp@alien8.de
Cc: hpa@zytor.com
Cc: kexec@lists.infradead.org
Cc: vgoyal@redhat.com
Cc: Vivek Goyal <vgoyal@redhat.com>
Link: https://lkml.kernel.org/r/117ef0c6.3d30.16b87c9cfbf.Coremail.kernelpatch@126.com
---
 arch/x86/kernel/crash.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 576b2e1bfc12..27157d66f807 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -56,7 +56,6 @@ struct crash_memmap_data {
  */
 crash_vmclear_fn __rcu *crash_vmclear_loaded_vmcss = NULL;
 EXPORT_SYMBOL_GPL(crash_vmclear_loaded_vmcss);
-unsigned long crash_zero_bytes;
 
 static inline void cpu_crash_vmclear_loaded_vmcss(void)
 {
@@ -181,6 +180,9 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
 }
 
 #ifdef CONFIG_KEXEC_FILE
+
+static unsigned long crash_zero_bytes;
+
 static int get_nr_ram_ranges_callback(struct resource *res, void *arg)
 {
 	unsigned int *nr_ranges = arg;