From patchwork Sun Aug 21 11:35:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conor Dooley X-Patchwork-Id: 1668510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=ozlabs.org (client-ip=150.107.74.76; helo=gandalf.ozlabs.org; envelope-from=srs0=o66g=yz=vger.kernel.org=sparclinux-owner@ozlabs.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=conchuod.ie header.i=@conchuod.ie header.a=rsa-sha256 header.s=google header.b=AW0FWHnY; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4M9YP14fbCz1yh4 for ; Sun, 21 Aug 2022 21:36:53 +1000 (AEST) Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4M9YP00Fm4z4xVD for ; Sun, 21 Aug 2022 21:36:52 +1000 (AEST) Received: by gandalf.ozlabs.org (Postfix) id 4M9YP00CXVz4xVF; Sun, 21 Aug 2022 21:36:52 +1000 (AEST) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=sparclinux-owner@vger.kernel.org; receiver=) Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=conchuod.ie header.i=@conchuod.ie header.a=rsa-sha256 header.s=google header.b=AW0FWHnY; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4M9YP004dvz4xVD for ; Sun, 21 Aug 2022 21:36:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230269AbiHULgu (ORCPT ); Sun, 21 Aug 2022 07:36:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230132AbiHULgZ (ORCPT ); Sun, 21 Aug 2022 07:36:25 -0400 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB26E26566 for ; Sun, 21 Aug 2022 04:36:23 -0700 (PDT) Received: by mail-wr1-x42e.google.com with SMTP id bs25so10069962wrb.2 for ; Sun, 21 Aug 2022 04:36:23 -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=3Hhq6c1GVxZBAzkMQCgfbkDKvjAOM1papJadtDKTm9mJD1VZ+9YPyQE3lRJ0sYlCtD 3sFsKBO3FxDo67Tyxl3hpy/unvTDarJNAI5W4CsGEPaDUSIxMrLfyRaWKDGjgpCVLAQc jqQeMCmS9k1H3om5cwnCDjsyHh7O3Lx1L8UqdZlFyBQdS8Tc6bkQ5ztFlR2mxTl6MLPv N6lsEHisRc9Vgyw10nKHHvDguJlPc8d3pFqQMNQPwZm/jluBs6ep8WalOFM+7nt8Vz+O C8NU3fXrNUraemE4x8TA5akPXfI1iPB5gRq6tuKWWsiMxQrrziG2EipJF+aGrEUVx5CJ 1SnQ== X-Gm-Message-State: ACgBeo3MJRhC5tWyr0G6Ggl/wFASK6WgDsYBpvdgyFsVw8GUJyTV6ZGP aesEis7ghfwVZxBuoAxXEHh2fA== X-Google-Smtp-Source: AA6agR6iyTE2UwdrwXTf+0eiBHvZb7pU8qO0Gz7AlF1LBKoiF+3yUIHGhx0/IDeGH85WpPOkmWdetw== 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 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: sparclinux@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);