From nobody Fri Nov 22 18:28:11 2024 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=1716311780; cv=none; d=zohomail.com; s=zohoarc; b=hIeAbfPueKM2SMLI/RbdaK6+6JUxy4/KE9vdoaBe3/pNsbSD5/Y/21+X0wgXBe+Wz6lvIQf8MBhR0vht7jnOYPrD8O0QQcC8VIs85bmQt1SMTOHq2TzVqMO3A7+7Gcwx1oGNA/7NxOzIHAYjaI0sZvMxkEvCojpzdDAIxLQrSEg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1716311780; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=5B2c9g1y7aKzjwGqZJNQwIvT3KveJvpY8WkxZZKikdI=; b=j3OTv0/jy/u1c8bIENSiLcZTTolPw7KchxqM9Itm8R9dKVK6yaaSOsWXeeBh3hESHdChll5cinoFPcf5OL+G3KoB9GZavQSZWxP/pmKb6NJa4fsDO9E4/1DGmv9s7QKOxkfczXHlxx4isOJ/KQdCzsF//DcRCTxxeEkTmNrUoNM= 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 1716311780110981.3547884584318; Tue, 21 May 2024 10:16:20 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.727007.1131404 (Exim 4.92) (envelope-from ) id 1s9T5g-000505-5N; Tue, 21 May 2024 17:15:56 +0000 Received: by outflank-mailman (output) from mailman id 727007.1131404; Tue, 21 May 2024 17:15:56 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1s9T5g-0004zw-1K; Tue, 21 May 2024 17:15:56 +0000 Received: by outflank-mailman (input) for mailman id 727007; Tue, 21 May 2024 17:15:55 +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 1s9T5e-0004kx-Uh for xen-devel@lists.xenproject.org; Tue, 21 May 2024 17:15:54 +0000 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [2a00:1450:4864:20::629]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id c6cc0968-1795-11ef-b4bb-af5377834399; Tue, 21 May 2024 19:15:52 +0200 (CEST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a5a5cb0e6b7so914803766b.1 for ; Tue, 21 May 2024 10:15:52 -0700 (PDT) Received: from andrewcoop.citrite.net ([160.101.139.1]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a5a17b01a2esm1633701766b.185.2024.05.21.10.15.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 10:15:51 -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: c6cc0968-1795-11ef-b4bb-af5377834399 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1716311752; x=1716916552; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5B2c9g1y7aKzjwGqZJNQwIvT3KveJvpY8WkxZZKikdI=; b=ntoYAngRptf6uQPSoPC5WUrVq1bnhlzt4WZpb5J9f2CykjF17levd1gENElY1PD6va ZWOCHkUhtJhJSo3y4sG2+JCqx7L9iPOR1Y8FRqeKp8qeAK4NozQJ/qZfUE+PDlZE9y4i +qQ/evlIngJtjucblxthV0IgI9SLQkYXHWTDo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716311752; x=1716916552; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5B2c9g1y7aKzjwGqZJNQwIvT3KveJvpY8WkxZZKikdI=; b=d9ufg7LN2KrHB/Ia1flrUr7ZFaEe1QLksA3ppi2k+wzOHeJ+LkRrK+aRpZy0KcaiNX Y58i/0PkuZPbAsgslWrQVAZD35IzWDvPIlBB+9zycfnU7TsxOgDK8dCp1luLWs/3466D uyOzyMEQfC679X+64J4ylOAL2rRCRkPUcFdGQVx+MToFT4tLFRUC5Y4ya6be23chNHOP zpDFbIqqlP5hajoGTC/SDTklZDnkC9Qm2DwiBu+5SLYB8uQsJb/FjMd224EFFi/62tzG JjytInpabPFbayKGFhfAMrukAWmuCA7zwsBG7yTDnR6evXMnytHiWM63ZuZFOFeyBc9g YEHQ== X-Gm-Message-State: AOJu0Yz2Wr5ajnkii1cCTpUEZqr6JSWLQ5OUQSEeHfPLwPHgswkXBW1d qa2xnEr8fxEBHWuTMFM4qKPrIMr82ytxSDbOjucnKpQ3v0fytyt0/AAOBxQ9wSiKkbC286U8a8H NjQc= X-Google-Smtp-Source: AGHT+IGKBlnC4aUlAtSStcXUBX/m7c79FkGO43xaEXt+WhXGcyap3nd6jcMgUWmIeKjp87TzozmoFw== X-Received: by 2002:a17:906:8315:b0:a59:a977:a154 with SMTP id a640c23a62f3a-a5a2d6786b5mr2132997566b.64.1716311751813; Tue, 21 May 2024 10:15:51 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , George Dunlap , Jan Beulich , Stefano Stabellini , Julien Grall , Roberto Bagnara , "consulting @ bugseng . com" , Oleksii Kurochko Subject: [PATCH 2/3] xen/x86: Drop useless non-Kconfig CONFIG_* variables Date: Tue, 21 May 2024 18:15:45 +0100 Message-Id: <20240521171546.3650664-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240521171546.3650664-1-andrew.cooper3@citrix.com> References: <20240521171546.3650664-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1716311780612100001 Content-Type: text/plain; charset="utf-8" These are all either completely unused, or do nothing useful. Signed-off-by: Andrew Cooper Reviewed-by: Stefano Stabellini --- CC: George Dunlap CC: Jan Beulich CC: Stefano Stabellini CC: Julien Grall CC: Roberto Bagnara CC: consulting@bugseng.com CC: Oleksii Kurochko --- xen/arch/x86/include/asm/config.h | 4 ---- xen/include/xen/acpi.h | 9 --------- xen/include/xen/watchdog.h | 11 ----------- 3 files changed, 24 deletions(-) diff --git a/xen/arch/x86/include/asm/config.h b/xen/arch/x86/include/asm/c= onfig.h index ab7288cb3682..24b005ba1ff7 100644 --- a/xen/arch/x86/include/asm/config.h +++ b/xen/arch/x86/include/asm/config.h @@ -20,7 +20,6 @@ #define BITS_PER_XEN_ULONG BITS_PER_LONG =20 #define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS 1 -#define CONFIG_DISCONTIGMEM 1 #define CONFIG_NUMA_EMU 1 =20 #define CONFIG_PAGEALLOC_MAX_ORDER (2 * PAGETABLE_ORDER) @@ -30,11 +29,8 @@ /* Intel P4 currently has largest cache line (L2 line size is 128 bytes). = */ #define CONFIG_X86_L1_CACHE_SHIFT 7 =20 -#define CONFIG_ACPI_SRAT 1 #define CONFIG_ACPI_CSTATE 1 =20 -#define CONFIG_WATCHDOG 1 - #define CONFIG_MULTIBOOT 1 =20 #define HZ 100 diff --git a/xen/include/xen/acpi.h b/xen/include/xen/acpi.h index e78e7e785252..bc4818c9430a 100644 --- a/xen/include/xen/acpi.h +++ b/xen/include/xen/acpi.h @@ -140,15 +140,6 @@ int get_cpu_id(u32 acpi_id); unsigned int acpi_register_gsi (u32 gsi, int edge_level, int active_high_l= ow); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); =20 -/* - * This function undoes the effect of one call to acpi_register_gsi(). - * If this matches the last registration, any IRQ resources for gsi - * are freed. - */ -#ifdef CONFIG_ACPI_DEALLOCATE_IRQ -void acpi_unregister_gsi (u32 gsi); -#endif - #ifdef CONFIG_ACPI_CSTATE /* * max_cstate sets the highest legal C-state. diff --git a/xen/include/xen/watchdog.h b/xen/include/xen/watchdog.h index 86fde0884ae7..434fcbdd2b11 100644 --- a/xen/include/xen/watchdog.h +++ b/xen/include/xen/watchdog.h @@ -9,8 +9,6 @@ =20 #include =20 -#ifdef CONFIG_WATCHDOG - /* Try to set up a watchdog. */ int watchdog_setup(void); =20 @@ -23,13 +21,4 @@ void watchdog_disable(void); /* Is the watchdog currently enabled. */ bool watchdog_enabled(void); =20 -#else - -#define watchdog_setup() ((void)0) -#define watchdog_enable() ((void)0) -#define watchdog_disable() ((void)0) -#define watchdog_enabled() ((void)0) - -#endif - #endif /* __XEN_WATCHDOG_H__ */ --=20 2.30.2