summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorMike Travis <mike.travis@hpe.com>2020-11-05 16:27:40 -0600
committerThomas Gleixner <tglx@linutronix.de>2020-11-07 11:17:39 +0100
commit1aee505e0171fc38fd5ed70c7f0dcbb7398c759f (patch)
treeb9948fce9160a102cf62a6ce027806afd968653c /arch/x86
parent1aec69ae56be28b5fd3c9daead5f3840c30153c8 (diff)
downloadlinux-stable-1aee505e0171fc38fd5ed70c7f0dcbb7398c759f.tar.gz
linux-stable-1aee505e0171fc38fd5ed70c7f0dcbb7398c759f.tar.bz2
linux-stable-1aee505e0171fc38fd5ed70c7f0dcbb7398c759f.zip
x86/platform/uv: Remove spaces from OEM IDs
Testing shows that trailing spaces caused problems with the OEM_ID and the OEM_TABLE_ID. One being that the OEM_ID would not string compare correctly. Another the OEM_ID and OEM_TABLE_ID would be concatenated in the printout. Remove any trailing spaces. Fixes: 1e61f5a95f191 ("Add and decode Arch Type in UVsystab") Signed-off-by: Mike Travis <mike.travis@hpe.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20201105222741.157029-3-mike.travis@hpe.com
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/apic/x2apic_uv_x.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index a5794794ea59..0f848d6dddc9 100644
--- a/arch/x86/kernel/apic/x2apic_uv_x.c
+++ b/arch/x86/kernel/apic/x2apic_uv_x.c
@@ -290,6 +290,9 @@ static void __init uv_stringify(int len, char *to, char *from)
{
/* Relies on 'to' being NULL chars so result will be NULL terminated */
strncpy(to, from, len-1);
+
+ /* Trim trailing spaces */
+ (void)strim(to);
}
/* Find UV arch type entry in UVsystab */