Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp1258144rwa; Sun, 21 Aug 2022 04:49:13 -0700 (PDT) X-Google-Smtp-Source: AA6agR4ec3bxyNhdUr/620mlDzXmOSm8NYamnaDAVvk1uxT5dmUfolGtfaVZIL/CZtQeqw3Ke4GL X-Received: by 2002:a17:902:f0d4:b0:172:aa2a:49ac with SMTP id v20-20020a170902f0d400b00172aa2a49acmr15348860pla.9.1661082553640; Sun, 21 Aug 2022 04:49:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661082553; cv=none; d=google.com; s=arc-20160816; b=hj93YDg59mz54acLVIKH0oAHMjHONbUTUh9cI0+ykpF1R1lN9Mqeu7eCyFuMBB3TxZ qHPkElA/f0SvS9NkT7ocnltq27nqCD1h2QVomHRsBxXvDTrB07lpiUTmbptfbXoVWVTY YxecQBDN9/dmMXb3zc0N/Vl2meWLUoUSBKDt/gzGQgfRfXXJXSRk86PHegOCiGort4+t 7nwL5Neq6wz9KKFewEUcABdXZkraWHcSzLbFazr3bNmt2/lmSJVfUbO3OqUq44oa1kzD d6rU/Add0y24STSreNbgVa7xbh+qxYCeEtEqoylRPh3RhNk4vHv8tkn1gKgefe3H2q+i EUDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=ktqp5nP81udpM1MG+l3gnY1pzvY8/PrjfTARX1xGZ74=; b=q5YDOjea39EHrjJUUMi2OHGZ2UC5rntlRLqOObBFp5yh39AmpWycExXSbbaf3PTF42 0NKE2GeZiKYFhp4d8NWMtV5NJrOX57/CKjgoTs0nYj835SqlYDZ2bFogfudIqL81o+cA XnpVReRkRT0m89wSPFFHyUrf1z++xR51wivpTDjGRt/o3IlLVDo5PngXbrdyHuqZrUJV RFa/p+fUGsYV7OJWRd0OwQ05UcSgO51+y1slUoEMmzW5qMsO06RdFpD5pLyIrisBP7Ur IM3cCdrgZvihzBStNdAyCWidmmy8zxzggaHXipzNsqu9UKUHNQMZUhHXqO0w9VZiJ67m j7dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@conchuod.ie header.s=google header.b=AW0FWHnY; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=conchuod.ie Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m3-20020a170902e40300b0016be6146f7fsi8870886ple.192.2022.08.21.04.49.00; Sun, 21 Aug 2022 04:49:13 -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=@conchuod.ie header.s=google header.b=AW0FWHnY; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=conchuod.ie Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230240AbiHULgh (ORCPT + 99 others); Sun, 21 Aug 2022 07:36:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbiHULgX (ORCPT ); Sun, 21 Aug 2022 07:36:23 -0400 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1DDD18349 for ; Sun, 21 Aug 2022 04:36:22 -0700 (PDT) Received: by mail-wr1-x432.google.com with SMTP id b5so5785936wrr.5 for ; Sun, 21 Aug 2022 04:36:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=conchuod.ie; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=ktqp5nP81udpM1MG+l3gnY1pzvY8/PrjfTARX1xGZ74=; b=AW0FWHnYgwNCmESZ2n9ygpoNMqROFdVrXmoyjs1i/V3e6l8BazQwWJHi9XMO+O637d Df4riE6PC/V/IgPUH8moc0EAfx7R5nCWwvG8iSYiE51RO1IzaDNMxbVkluZz63D/jFsp sQfEu3LXgHPhM16VTmczW97sJwY69CLLTXVNAY8pZeDKe4dB8m3oCjol2mhGPp1ahO2V ComPKJXyP3hAynPugfvZ3yXbmXZ7FkJXWMP8Y43x82GZahVFA7F1jqsxQLkrc9fWCoJf P8nByGfCjdrtXVcb5dZ+jg18p6ejOPnoJLMHJlkjhG/J8lyAObKocbWp1a2AGk+RECcD /M2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=ktqp5nP81udpM1MG+l3gnY1pzvY8/PrjfTARX1xGZ74=; b=UsO+4FPw0GO6eiG4kuysDln2fHD7aDnrvPyGDD52+DXgX+8RHOzaUPpYkQcBFMnZ2M B/GB15amvotKyidwd3gdrTWkMgBomUZi4M6R2DVrgHxkyBzw5wzdGf6MtK1WFeIeErPw G4CiL6vdlENlgF0DMBXFq8u08d/ORr/WseNbsTEnIcXHbaJIuxoC/JG1QewpNakBDBOl DcHJtmpAgWZhpzSuzITnZBWLu4OuH6OTX8OO3OltreHwNpIDcacyJHUZOf0zmopkTfoq eQEO2Y/7bFQa5AaMmbVQVSWlAOibEstqy861a011i82OCGZaPRjrJUM6O3gjwL0/I5Iu XGjQ== X-Gm-Message-State: ACgBeo0YOwR6WCckRG2bbn4qnfMON0sxPizn+w+QSQXABEu6x4Wq7lMf ch6eYTIrQFXq5iAlUDs1kfbWWA== X-Received: by 2002:a05:6000:184c:b0:223:2c8b:c43c with SMTP id c12-20020a056000184c00b002232c8bc43cmr8659598wri.16.1661081782206; Sun, 21 Aug 2022 04:36:22 -0700 (PDT) Received: from henark71.. ([51.37.149.245]) by smtp.gmail.com with ESMTPSA id m9-20020a7bce09000000b003a3442f1229sm14071361wmc.29.2022.08.21.04.36.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Aug 2022 04:36:21 -0700 (PDT) From: Conor Dooley To: Michal Simek , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Yoshinori Sato , Rich Felker , "David S . Miller" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H . Peter Anvin" , Arnd Bergmann Cc: Geert Uytterhoeven , Conor Dooley , Kees Cook , Peter Zijlstra , linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org Subject: [PATCH 3/6] s390: use the asm-generic version of cpuinfo_op Date: Sun, 21 Aug 2022 12:35:10 +0100 Message-Id: <20220821113512.2056409-4-mail@conchuod.ie> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220821113512.2056409-1-mail@conchuod.ie> References: <20220821113512.2056409-1-mail@conchuod.ie> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 From: Conor Dooley There's little point in duplicating the declaration of cpuinfo_op now that there's a shared version of it, so drop it & include the generic header. Signed-off-by: Conor Dooley --- arch/s390/include/asm/processor.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index bd66f8e34949..48d2332a5899 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -41,6 +41,7 @@ #include #include #include +#include typedef long (*sys_call_ptr_t)(struct pt_regs *regs); @@ -80,7 +81,6 @@ void s390_adjust_jiffies(void); void s390_update_cpu_mhz(void); void cpu_detect_mhz_feature(void); -extern const struct seq_operations cpuinfo_op; extern void execve_tail(void); extern void __bpon(void); unsigned long vdso_size(void); -- 2.37.1