From patchwork Wed Aug 9 16:49:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 133335 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp2931458vqr; Wed, 9 Aug 2023 09:51:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHAk3ArT9ZtVMP2pz1hQvZM5HxYTawtjH59ruM6ThaMJmyPxGckHmniefo2DaOzhH5BDRwV X-Received: by 2002:a17:906:84:b0:99c:55a9:59da with SMTP id 4-20020a170906008400b0099c55a959damr2562206ejc.44.1691599861248; Wed, 09 Aug 2023 09:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691599861; cv=none; d=google.com; s=arc-20160816; b=s8OiyCCf6Vak2ioL9MlnuFZhP+FHmKO0MUiuEDRxrhepPT5BLQlfrczLaVBcSf3vu7 HEG5WFVO6IOuw2fReKi1m+V6/OXb543drojpAmXYKIk5Fd2lPMOwEdEM46dplteC8psi e5YFytpDMKq4jhs1MFC9AzZtHbG99sSajRyWMOZun/qBY3V1IMzPFgkYnGhDNdO+tI/0 uk3ENEZAZQ2wwIzZchslX9o46f9KxOtgd/gjzN0DRuXgrw7SoIKMmsr2ANbcllrSBbz0 82y5L5MjVqgGi8yg46Cwybq/w6F+IhQ3GLDBi5uGoao03kd717xiSVO32l6E5aqsVJ3c 6yeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=BZ/XvBizNSRZH3+jEVSRii67c4wak6kwB/D6ykNTW7o=; fh=xeBNGOuZM5vy4okdFvBNsMTGHQ6tdBlFPaNKCUScG5A=; b=DFee554JqD+qkIqDXmllabOuf852d+bhc5o7UL3VO7BnhSntaD6Gi5RU2JrMx/orsg KOowjS4eIPFyanYcW2EEnswmjDgn1ZWg8PG/HFXUDU7MWrXn2hTTPFjVNPnS3mxvGv1Z pNW86GohAd23pUk/22/d3Y3LK89z/1AJC8wOQoTXl7EENYwiQx/YA/03tqYQaaUGFlWZ 0UYhF7NXKv4cH3JyjWZldTefHXuby4U7DeKCxAKVaA2gGS8+4MT/RrnJNPiTtaKjR2ut 0MH35TPB2g7iJXnYOKqPve2RLHVDMfEG/xY6tGlt83sWPboTr/NPnZBobj8y/Ho5m0wU LgHg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FUZmK1x8; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="qlwBvR/O"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p22-20020a170906b21600b00989027eb30bsi9157206ejz.610.2023.08.09.09.50.36; Wed, 09 Aug 2023 09:51:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FUZmK1x8; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="qlwBvR/O"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231289AbjHIQtf (ORCPT + 99 others); Wed, 9 Aug 2023 12:49:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230463AbjHIQtb (ORCPT ); Wed, 9 Aug 2023 12:49:31 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D5DD1BFE; Wed, 9 Aug 2023 09:49:31 -0700 (PDT) Date: Wed, 09 Aug 2023 16:49:29 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1691599769; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZ/XvBizNSRZH3+jEVSRii67c4wak6kwB/D6ykNTW7o=; b=FUZmK1x8YJQNA/XhektLQ4CZUuUUqszLnB5SgP+FJC8cfo67U68Zzs91Dy73jrgrmK9qkv Qru+4Xp6yUIONMpbTiXTMmI3HARjHGpYuisPTG9PxoKmqo0w3n84/2TZDTOFkLJFT+caLg oDRL0MPe2qmDGUDrs/sSR4SzOoeUV5eAVc/aBmwiQfh4iuBHm384dclW0V5kn5y23fcYxX B5SqWaNTQZTPjEMnMaWzMx5HrcGdlGN0Xl4HhYgCYAp6xH2WUfaMFZaLf3Sp7p3SYETxHS FO7Q6SS+BvypQ1WOANgH8OMV/9QRJDY/vy69pX4e0B1QxHaCvc80hv1NldcA2g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1691599769; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BZ/XvBizNSRZH3+jEVSRii67c4wak6kwB/D6ykNTW7o=; b=qlwBvR/O/hYAHpw5wXekVPqsUvFMPsrTIXe39SK0/HGn1TOb9I8kRcbwg2gjyWi3gXk9Oz bbs06LOXu069qOBQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/apic] x86/apic/uv: Get rid of wrapper callbacks Cc: Thomas Gleixner , Dave Hansen , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <169159976931.27769.9436204031161182367.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773771016014231270 X-GMAIL-MSGID: 1773771016014231270 The following commit has been merged into the x86/apic branch of tip: Commit-ID: 69297283bf5757dc41a42cc34c6a86006e2a2391 Gitweb: https://git.kernel.org/tip/69297283bf5757dc41a42cc34c6a86006e2a2391 Author: Thomas Gleixner AuthorDate: Tue, 08 Aug 2023 15:04:07 -07:00 Committer: Dave Hansen CommitterDate: Wed, 09 Aug 2023 08:10:12 -07:00 x86/apic/uv: Get rid of wrapper callbacks Why on earth makes a wrapper around some common function sense? Just to be able to slap some vendor name on it... Signed-off-by: Thomas Gleixner Signed-off-by: Dave Hansen Acked-by: Peter Zijlstra (Intel) --- arch/x86/kernel/apic/x2apic_uv_x.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c index f532c58..f0580a6 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -783,11 +783,6 @@ static int uv_apic_id_valid(u32 apicid) return 1; } -static u32 apic_uv_calc_apicid(unsigned int cpu) -{ - return apic_default_calc_apicid(cpu); -} - static unsigned int x2apic_get_apic_id(unsigned long id) { return id; @@ -838,7 +833,7 @@ static struct apic apic_x2apic_uv_x __ro_after_init = { .get_apic_id = x2apic_get_apic_id, .set_apic_id = set_apic_id, - .calc_dest_apicid = apic_uv_calc_apicid, + .calc_dest_apicid = apic_default_calc_apicid, .send_IPI = uv_send_IPI_one, .send_IPI_mask = uv_send_IPI_mask,