From: "tip-bot2 for Mike Travis" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Mike Travis <mike.travis@hpe.com>,
Thomas Gleixner <tglx@linutronix.de>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: x86/urgent] x86/platform/uv: Remove spaces from OEM IDs
Date: Sat, 07 Nov 2020 10:18:45 -0000 [thread overview]
Message-ID: <160474432512.397.9918454290577687435.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20201105222741.157029-3-mike.travis@hpe.com>
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: 1aee505e0171fc38fd5ed70c7f0dcbb7398c759f
Gitweb: https://git.kernel.org/tip/1aee505e0171fc38fd5ed70c7f0dcbb7398c759f
Author: Mike Travis <mike.travis@hpe.com>
AuthorDate: Thu, 05 Nov 2020 16:27:40 -06:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Sat, 07 Nov 2020 11:17:39 +01:00
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
---
arch/x86/kernel/apic/x2apic_uv_x.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c
index a579479..0f848d6 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 */
next prev parent reply other threads:[~2020-11-07 10:18 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-05 22:27 [PATCH 0/3] x86/platform/uv: UV5 Update Fixes Mike Travis
2020-11-05 22:27 ` [PATCH 1/3] x86/platform/uv: Fix missing OEM_TABLE_ID Mike Travis
2020-11-07 10:18 ` [tip: x86/urgent] " tip-bot2 for Mike Travis
2020-11-05 22:27 ` [PATCH 2/3] x86/platform/uv: Remove spaces from OEM IDs Mike Travis
2020-11-07 10:18 ` tip-bot2 for Mike Travis [this message]
2020-11-05 22:27 ` [PATCH 3/3] x86/platform/uv: Recognize UV5 hubless system identifier Mike Travis
2020-11-07 10:18 ` [tip: x86/urgent] " tip-bot2 for Mike Travis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=160474432512.397.9918454290577687435.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mike.travis@hpe.com \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®