[PATCH 4.18 04/22] x86/platform/UV: Mark memblock related init code and data correctly
From: Greg Kroah-Hartman
Date: Thu Aug 16 2018 - 14:50:03 EST
4.18-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dou Liyang <douly.fnst@xxxxxxxxxxxxxx>
commit 24cfd8ca1d28331b9dad3b88d1958c976b2cfab6 upstream.
parse_mem_block_size() and mem_block_size are only used during init. Mark
them accordingly.
Fixes: d7609f4210cb ("x86/platform/UV: Add kernel parameter to set memory block size")
Signed-off-by: Dou Liyang <douly.fnst@xxxxxxxxxxxxxx>
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: hpa@xxxxxxxxx
Cc: Mike Travis <mike.travis@xxxxxxx>
Cc: Andrew Banman <andrew.banman@xxxxxxx>
Link: https://lkml.kernel.org/r/20180730075947.23023-1-douly.fnst@xxxxxxxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/x86/kernel/apic/x2apic_uv_x.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -394,10 +394,10 @@ extern int uv_hub_info_version(void)
EXPORT_SYMBOL(uv_hub_info_version);
/* Default UV memory block size is 2GB */
-static unsigned long mem_block_size = (2UL << 30);
+static unsigned long mem_block_size __initdata = (2UL << 30);
/* Kernel parameter to specify UV mem block size */
-static int parse_mem_block_size(char *ptr)
+static int __init parse_mem_block_size(char *ptr)
{
unsigned long size = memparse(ptr, NULL);