Received: by 2002:a25:23cc:0:0:0:0:0 with SMTP id j195csp763931ybj; Thu, 7 May 2020 07:09:33 -0700 (PDT) X-Google-Smtp-Source: APiQypJQTuODlyZuC1TrKIGxG2cg2K7DKuBE5m3AoPdJf3o9FmiqqxL2ZEzKbXV1kzCDYz59XLSM X-Received: by 2002:a17:906:b2c2:: with SMTP id cf2mr11770552ejb.262.1588860573448; Thu, 07 May 2020 07:09:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588860573; cv=none; d=google.com; s=arc-20160816; b=VcaeXC0tfJQYGcfjLnxMedMf6oLVLaCKCMxqj2oC2kHBW+JjO9st7yCpyyg7grUOPR /7wKea6qFlpIe/y1inLb3lDb4uVql+0a5XvSX368artY9i4/o4fow7qhrw6wa5Mezv+m pd4a2IN4sKc6itugu5tBTi9Z/r9pxnbxkygCpJmPKvSkm5AKDMBp0mQi5mHeRY8JFvpi MEQT0vm+DonvMCCJA9M80oTxnN3RAWrIqT9s3NLt9hlLpfLrvYJzU4fRPya73UL3PogN 0m5a5MzRi351n3WdXl67++PUTpH458m631oA8axVOphWQYP8RtzdsmUtsGcOzCqT5SvY bLaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=9ZLQkoDt2UKSu2Xe2PWjKZE85TS5IZ+gRIRIlM28rcQ=; b=SMbjyQg44/MEjQ2oy64cwfdC5df8s094TrPdMKlfUyissr9OFk+C/KSo3DnQWsilcP lJLcPGWpAD+XsetKXRiZkYzTXDc0oX9WyneoeGv5scJCesHOA6yNKU1Q8gMSbvZ3MMas zwFA5MimnQ1J5MUi3SrAzv1k6LYfI3Y5PeDHZ6DX8xI9WlEhjgFXyywSt7HvT6fqPTD7 NWYX+6hksQDYqvwmAN0kDIn3JeAo23WaQ42bUrPTRzQcJegI4ig3GAX/4mIiQp+97gku 5yexwy0Ya4cjPuqPj+U557nLc1T08VLl6FCZ8iJi+cHso9h/CrhK/gD1cPRBFaw1CtKI 01Hg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j3si2223423ejb.294.2020.05.07.07.09.09; Thu, 07 May 2020 07:09:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727768AbgEGOHa (ORCPT + 99 others); Thu, 7 May 2020 10:07:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727032AbgEGOH2 (ORCPT ); Thu, 7 May 2020 10:07:28 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8031C05BD43; Thu, 7 May 2020 07:07:27 -0700 (PDT) Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jWhBM-00029T-Fz; Thu, 07 May 2020 16:07:24 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 1C5511C001A; Thu, 7 May 2020 16:07:24 +0200 (CEST) Date: Thu, 07 May 2020 14:07:24 -0000 From: "tip-bot2 for Christoph Hellwig" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/platform] x86/platform/uv: Remove the uv_partition_coherence_id() macro Cc: Christoph Hellwig , Thomas Gleixner , Russ Anderson , x86 , LKML In-Reply-To: <20200504171527.2845224-3-hch@lst.de> References: <20200504171527.2845224-3-hch@lst.de> MIME-Version: 1.0 Message-ID: <158886044406.8414.6326875486008539337.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/platform branch of tip: Commit-ID: 32988cfd579f7912aeb9a66bf44ca4ce0fa860f1 Gitweb: https://git.kernel.org/tip/32988cfd579f7912aeb9a66bf44ca4ce0fa860f1 Author: Christoph Hellwig AuthorDate: Mon, 04 May 2020 19:15:18 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 07 May 2020 15:32:19 +02:00 x86/platform/uv: Remove the uv_partition_coherence_id() macro uv_partition_coherence_id() is only used once. Just open code it in the only user. Signed-off-by: Christoph Hellwig Signed-off-by: Thomas Gleixner Not-acked-by: Dimitri Sivanich Cc: Russ Anderson Link: https://lkml.kernel.org/r/20200504171527.2845224-3-hch@lst.de --- arch/x86/include/asm/uv/bios.h | 1 - arch/x86/platform/uv/uv_sysfs.c | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/include/asm/uv/bios.h b/arch/x86/include/asm/uv/bios.h index fc85daf..2fcc3ac 100644 --- a/arch/x86/include/asm/uv/bios.h +++ b/arch/x86/include/asm/uv/bios.h @@ -140,7 +140,6 @@ extern long sn_partition_id; extern long sn_coherency_id; extern long sn_region_size; extern long system_serial_number; -#define uv_partition_coherence_id() (sn_coherency_id) extern struct kobject *sgi_uv_kobj; /* /sys/firmware/sgi_uv */ diff --git a/arch/x86/platform/uv/uv_sysfs.c b/arch/x86/platform/uv/uv_sysfs.c index 6221473..266773e 100644 --- a/arch/x86/platform/uv/uv_sysfs.c +++ b/arch/x86/platform/uv/uv_sysfs.c @@ -21,7 +21,7 @@ static ssize_t partition_id_show(struct kobject *kobj, static ssize_t coherence_id_show(struct kobject *kobj, struct kobj_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%ld\n", uv_partition_coherence_id()); + return snprintf(buf, PAGE_SIZE, "%ld\n", sn_coherency_id); } static struct kobj_attribute partition_id_attr =