From nobody Fri Dec 19 04:06:50 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1745321603; cv=none; d=zohomail.com; s=zohoarc; b=Hh9uXk2Z/LCTd/G5NS36/AB4ymXP+4OUq9jgYsW+tOIn8xLLbkRp6ruAPZ5TXfB46GS/m2qYhCYgJQmpnzW4hhpgussPRgT4Vra5iI0i5wQB9Byza8viIcZnC5A33c6Z0b4aDfgjouUt7CxnMw51jv6MZ7i9G+IKZP07EV7T3xA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1745321603; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Fx+o/dQ58isqOyEG718e5dLb1KkGAs/SXDSdWo0AZ+8=; b=Ewx4xJe4itNiCWo9bh62fCDl+MEOXDyLK20pID+EsbEbujAx9W8Zf7puSn6CPPe2yrkqLlbZPd5CJ/cKpkSm3fvMGmAGkCdX8ZX/Ggw0IreeAnZtMloDNldz2lfmTWBL6oP2xIEfavSCzTrBIEYgNWBRVc6a2WL4VBCYw9VFTDE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1745321602912487.5053787697583; Tue, 22 Apr 2025 04:33:22 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.962488.1353698 (Exim 4.92) (envelope-from ) id 1u7BsH-0004QH-Tx; Tue, 22 Apr 2025 11:33:13 +0000 Received: by outflank-mailman (output) from mailman id 962488.1353698; Tue, 22 Apr 2025 11:33:13 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u7BsH-0004Q5-RT; Tue, 22 Apr 2025 11:33:13 +0000 Received: by outflank-mailman (input) for mailman id 962488; Tue, 22 Apr 2025 11:33:12 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1u7BsG-00048Z-HN for xen-devel@lists.xenproject.org; Tue, 22 Apr 2025 11:33:12 +0000 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [2a00:1450:4864:20::429]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 8b5164c6-1f6d-11f0-9ffb-bf95429c2676; Tue, 22 Apr 2025 13:32:59 +0200 (CEST) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-39ac9aea656so6343041f8f.3 for ; Tue, 22 Apr 2025 04:33:11 -0700 (PDT) Received: from localhost.localdomain ([83.104.178.215]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-39efa420816sm15195591f8f.15.2025.04.22.04.33.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Apr 2025 04:33:09 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 8b5164c6-1f6d-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1745321590; x=1745926390; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Fx+o/dQ58isqOyEG718e5dLb1KkGAs/SXDSdWo0AZ+8=; b=EmEyMplD1wf+ngEGqUcqp33XPUS1gVPRzZCaUah+2k5bUHzlpAQna/ZMgHaYtR6bQ1 y52Td+0zBouNUzu6/HgSG2XrV+JweZ5BCqJ3Pvohr0csbrvlo7icMDSku5H8osUp4I6k vdrfVFll3WPL8KeNny16fdniqfHVB7Nfh9bmE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745321590; x=1745926390; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Fx+o/dQ58isqOyEG718e5dLb1KkGAs/SXDSdWo0AZ+8=; b=KnPMQb7bRm3u0RIl1ZCoO+HVpmNxG5kYGyk1qnF+6fb/MQ8r64mXafC4/t323Z9X92 54fSO/gZ2kKrq58ETQFiQaAJbw7g/cXbKGbT6oh0I1J4WcB0dnfiDx4lh8IW/Qkjwzri aMK1U820iMucUBdVprQxHRmmDlf9sUtflCJBA9s7cB6Lh3ndrm5do0XxbZJrIBt+EpGQ lGW9D19qp6xPzZCmCyl6lFrF4GL7ezfT78q8syWQx7TqTnR03eGsmU2NV34MjI1rWqHa Y/GjaPivxsIdhBKJ+2WjY8bpvHBrn4r7bJFFs0AJZeHxu/S6noaQU2r8EYr59lefEuTb fVBw== X-Gm-Message-State: AOJu0YwLVp/bvh7fIGTFsM+M/yTWlMra9aiXJokNa06uzb/6DkSw51wk YwX7QEtT8EboUVDVF9TPr7z/aPdJZKk7jHHujECbUKlW9SiBu24az+HU2eINqy5PV30rI1qHoEx bKSmF2w== X-Gm-Gg: ASbGncu9NoRe11c8y9SjuWrG5cuCGpSARG2CFA4icW5v6c+9w560bSgy858CzfeDj2x bAgJui4jzbhvEZZxU5JH6A2ig6ZKTu0BAjOPHlZ7CTcrDpXPnkcWXqeSgCx4JwpIj0ZqF5ts2Cl wjrWDZOcLGVqSnnidjXgMU4AsGzRIV7cYanLhg3sEI1TqUSKP0MgiMTmC3hRETLJW0x+ywO3SOQ kFJLp4mbSwLYj4zX73yh31lb8fwlZiH/Esh9ZDSWv55tVtzwhxURVfMiFjy5H177CckYtUCw0Nw 5dms7yKkFhz2iVJD29koI37jiSLLLrjWBIJOXGmlrAgkVzPf5f/yywdbof2zEg== X-Google-Smtp-Source: AGHT+IHQXe4zXh5S3iWTfzymfmpb18OE3/B48Bqywyw4taEp8wiQN1jy/yf/I/+5uvbLPr8iBrtEpg== X-Received: by 2002:a05:6000:713:b0:39e:cbc7:ad45 with SMTP id ffacd0b85a97d-39efbaf6c2emr10858331f8f.52.1745321590230; Tue, 22 Apr 2025 04:33:10 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH] x86/alternative: Clean up headers Date: Tue, 22 Apr 2025 12:33:07 +0100 Message-Id: <20250422113307.1285890-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1745321603973019100 alternative.h doesn't need lib.h now that macros.h exists. Futhermore, STR= () is already the prevailing style, so convert the final __stringify() to drop stringify.h too. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 --- xen/arch/x86/include/asm/alternative.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/x86/include/asm/alternative.h b/xen/arch/x86/include/= asm/alternative.h index 38472fb58e2d..7326ad942836 100644 --- a/xen/arch/x86/include/asm/alternative.h +++ b/xen/arch/x86/include/asm/alternative.h @@ -4,8 +4,10 @@ #ifdef __ASSEMBLY__ #include #else -#include -#include + +#include +#include + #include #include =20 @@ -65,7 +67,7 @@ extern void alternative_branches(void); " .endif\n" \ " .long .LXEN%=3D_orig_s - .\n" /* label */ \ " .long " alt_repl_s(num)" - .\n" /* new instruction */ \ - " .word " __stringify(feature) "\n" /* feature bit */ \ + " .word " STR(feature) "\n" /* feature bit */ \ " .byte " alt_orig_len "\n" /* source len */ \ " .byte " alt_repl_len(num) "\n" /* replacement len */ \ " .byte " alt_pad_len "\n" /* padding len */ \ --=20 2.39.5