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 CAA1219E7FA; Thu, 15 Aug 2024 13:40:44 +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=1723729244; cv=none; b=HQRVD4g718h8NXMeSE9UQQEZbwZxdrXbYUTNeciAAFbC0Ls16eW6vlIuchhZJyn/P1m/XUZpfwqP1xdlbiZKrF70tw2FU3QTT+iJXB4DkbivpWEteHU7BwURsi+ORHZFcIAd8sUwY488/jEySH2/jcdix/KnvivkjdYAjlI/SJc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1723729244; c=relaxed/simple; bh=TUpcEs7FQQ+4zz0y91ED/0BqVCsF2Dp+dbhBgtZm724=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j5ptD6BJWbXLkA7bWeMaG/eqix2BAQWwu6AwVyJTDPVQCPsCiTev45aW3Jwjory6HcDRwRb6ckAEFNlilB58DmAYuTwa7BNFugdtHL+atX9vIygIfA/BzK46IE39U20jOy2qjmHgeWWFNGKEiyNjQA7tWpsYpwGamjey63O4Lzo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yrfKUWmD; 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="yrfKUWmD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3E26C32786; Thu, 15 Aug 2024 13:40:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1723729244; bh=TUpcEs7FQQ+4zz0y91ED/0BqVCsF2Dp+dbhBgtZm724=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yrfKUWmDti9Gr9lM0U4D7m6/JVF/YJCHB73suE2gGy3LW9d9zj4Te8QJyWlYKdiHO kJaYKobrjIIp7Sjc/5p0eY5bMLA3xuJ213+1xVhlkO/HsXi7uqIhPwijGcY52WzTGX URjZW1SgwWbY53er30r/0kcD9rnvEs6SEKozhhIg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chen Ni , Juergen Gross , Sasha Levin Subject: [PATCH 5.15 037/484] x86/xen: Convert comma to semicolon Date: Thu, 15 Aug 2024 15:18:15 +0200 Message-ID: <20240815131942.705937270@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240815131941.255804951@linuxfoundation.org> References: <20240815131941.255804951@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: Chen Ni [ Upstream commit 349d271416c61f82b853336509b1d0dc04c1fcbb ] Replace a comma between expression statements by a semicolon. Fixes: 8310b77b48c5 ("Xen/gnttab: handle p2m update errors on a per-slot basis") Signed-off-by: Chen Ni Reviewed-by: Juergen Gross Link: https://lore.kernel.org/r/20240702031010.1411875-1-nichen@iscas.ac.cn Signed-off-by: Juergen Gross Signed-off-by: Sasha Levin --- arch/x86/xen/p2m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index 5e6e236977c75..9b3a9fa4a0ade 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -736,7 +736,7 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops, * immediate unmapping. */ map_ops[i].status = GNTST_general_error; - unmap[0].host_addr = map_ops[i].host_addr, + unmap[0].host_addr = map_ops[i].host_addr; unmap[0].handle = map_ops[i].handle; map_ops[i].handle = INVALID_GRANT_HANDLE; if (map_ops[i].flags & GNTMAP_device_map) @@ -746,7 +746,7 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops, if (kmap_ops) { kmap_ops[i].status = GNTST_general_error; - unmap[1].host_addr = kmap_ops[i].host_addr, + unmap[1].host_addr = kmap_ops[i].host_addr; unmap[1].handle = kmap_ops[i].handle; kmap_ops[i].handle = INVALID_GRANT_HANDLE; if (kmap_ops[i].flags & GNTMAP_device_map) -- 2.43.0