From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93A2B441D; Thu, 13 Jun 2024 12:47:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718282822; cv=none; b=Ut+SkPpoOf7jV+LIfc/tL+EbtIHkz08/wA5cT35Upf5kVZlV6zHyHt/DubKTyCleE8d/OEBwSPXmFR9S7SAkskLUaWL+7XcPvNmsAdkY8+XH4fnE76H1CY/yYXWHNWL3k4chk72XuT0iO5I7RUGrRCPAAhUTop4qkCEnlkMkD4w= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718282822; c=relaxed/simple; bh=zSkOEeoGjZhaZYpcmeFZ1jKH2yH5yrenmv4HyQM46wk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cbvuKwj26gh06GoRisA5Kw1QZjJ/JE8CyevOeJYgfJdAqd0wL5ZxhespcLOAyGzdttoqV5qHGC8EqXJqpu+ASC+zFgq/CswXy2/7RcrDQhZ3dqS0AWz+GE8hQnhzPRIonG+EvdkvzKqIN1fStCPAwE3rDxCdk4XiTYRE1yGWQMQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bWhtIkFU; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="bWhtIkFU" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19ABAC32786; Thu, 13 Jun 2024 12:47:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718282822; bh=zSkOEeoGjZhaZYpcmeFZ1jKH2yH5yrenmv4HyQM46wk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bWhtIkFUyDYWUkWBn/r7isvQRoScpDonZFJrMwEAx+hVjy/hlcdqJaJqAwik3kqWC IVUqYjLxYU+NvKKtaBbew39yJjFH1hbGn3K4Xcuj1H/gM6LgwgQ1wmhox3UuPSaQBj wvJJGNze8GkKeITKQz3FXbatGOrIg20rKMArs6G4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Douglas Anderson , Justin Stitt , Daniel Thompson Subject: [PATCH 5.15 389/402] kdb: Merge identical case statements in kdb_read() Date: Thu, 13 Jun 2024 13:35:46 +0200 Message-ID: <20240613113317.319222702@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240613113302.116811394@linuxfoundation.org> References: <20240613113302.116811394@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Daniel Thompson commit 6244917f377bf64719551b58592a02a0336a7439 upstream. The code that handles case 14 (down) and case 16 (up) has been copy and pasted despite being byte-for-byte identical. Combine them. Cc: stable@vger.kernel.org # Not a bug fix but it is needed for later bug fixes Reviewed-by: Douglas Anderson Tested-by: Justin Stitt Link: https://lore.kernel.org/r/20240424-kgdb_read_refactor-v3-4-f236dbe9828d@linaro.org Signed-off-by: Daniel Thompson Signed-off-by: Greg Kroah-Hartman --- kernel/debug/kdb/kdb_io.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) --- a/kernel/debug/kdb/kdb_io.c +++ b/kernel/debug/kdb/kdb_io.c @@ -304,6 +304,7 @@ poll_again: } break; case 14: /* Down */ + case 16: /* Up */ memset(tmpbuffer, ' ', strlen(kdb_prompt_str) + (lastchar-buffer)); *(tmpbuffer+strlen(kdb_prompt_str) + @@ -318,15 +319,6 @@ poll_again: ++cp; } break; - case 16: /* Up */ - memset(tmpbuffer, ' ', - strlen(kdb_prompt_str) + (lastchar-buffer)); - *(tmpbuffer+strlen(kdb_prompt_str) + - (lastchar-buffer)) = '\0'; - kdb_printf("\r%s\r", tmpbuffer); - *lastchar = (char)key; - *(lastchar+1) = '\0'; - return lastchar; case 9: /* Tab */ if (tab < 2) ++tab;