From patchwork Wed Sep 13 14:07:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138825 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120052vqx; Wed, 13 Sep 2023 07:19:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEz/4nNafbyO8hLXvtynPDZrC5f4d4MFdM3bQovzPrvYDXGEGtgpHnZsBr00E+0cwcOa7m1 X-Received: by 2002:a17:902:740a:b0:1bf:25a0:f875 with SMTP id g10-20020a170902740a00b001bf25a0f875mr2922067pll.39.1694614769748; Wed, 13 Sep 2023 07:19:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614769; cv=none; d=google.com; s=arc-20160816; b=BVatGPcZJSfqog6myU0Be1Wl/x/Kb+VfpzMjm7UGxwWgyQc3DUlPByt2BOoSUaFfBK aEvgkOSNtRP9VBRZuVUJII2c5IeUsS2+I0gK/XkZpOJq5en5LkJt/vWOTFmN+GtGem16 VFvJ0REDB+Q9K3QBiSwjuBNuYBPEhyXlO593aF8MzO4vFx8xh2cBqQf/C0M+dhDWAR2Y GH+/XOjOy0VxDHF42ihJ3zjGBPpmGm5n9XKzyg1qVlf0pvOjIgviS4w4TaOavopSymo+ PUAdU8n2ya7ISwGwmcmvSp1YZqmtNUkJkFPKHzUhki8o/Lfa4qZp6m5JFAJXohygbePL ANuw== 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; bh=kn/hJ3F0UgtRPjkVxEr1HKhYzN4tmtiRVF0410IFRjU=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=vfisWLxcdQ2ViWrAD5NR1ORs7XtL5rShSfIsfgyusRZuhvFlTZJE+1oYcvUN5CXEK8 Jhh97morbyF34g58rU3HyeKE2T4rtDHZB3c8X5Yiixo+z2l3t5k2jCbzj1T8PtyV+4ir ADXjw6yCVwumh+riPTF4VA6zIDjnfdxUJX75siLM6k2HCGrJqub3K6NdHlC6+Ri1CfLx QhCkU4AtfeEX9nrJf7AQaV+ibeL+IiUbOnWhnZqwy2hYg1TekjGnucC0irS+btXQ/Npn UhUTmiFDBULL4zPVcy3mM0aCc1dBMtgxb0SgcGWmAX84KM3nHezXKHc/kNBv7wH5xkp3 IiNg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id kz5-20020a170902f9c500b001c33d33975esi10110575plb.133.2023.09.13.07.19.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:19:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 26C4B80417D6; Wed, 13 Sep 2023 07:09:04 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241261AbjIMOI4 (ORCPT + 36 others); Wed, 13 Sep 2023 10:08:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241229AbjIMOIy (ORCPT ); Wed, 13 Sep 2023 10:08:54 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 700D119BF for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by andre.telenet-ops.be with bizsmtp id lS8m2A00H3fvA4V01S8mWf; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cqy-7J; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3T-Ib; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 01/52] m68k: kernel: Add missing asmlinkage to do_notify_resume() Date: Wed, 13 Sep 2023 16:07:51 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:04 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932376925423069 X-GMAIL-MSGID: 1776932376925423069 do_notify_resume() is called from assembly code, so it should be marked asmlinkage for documentation purposes. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/signal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index ba468b5f3f0b65bd..459c5ff69fcfa126 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -1109,7 +1109,7 @@ static void do_signal(struct pt_regs *regs) restore_saved_sigmask(); } -void do_notify_resume(struct pt_regs *regs) +asmlinkage void do_notify_resume(struct pt_regs *regs) { if (test_thread_flag(TIF_NOTIFY_SIGNAL) || test_thread_flag(TIF_SIGPENDING)) From patchwork Wed Sep 13 14:07:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138855 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1124217vqx; Wed, 13 Sep 2023 07:25:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0wo+Ni1x54mtTuEtdkkKyeUecI1aQLMlxzFlBTktjXT/6MIvHSVxdiPb+B6S/Bv3gDvd5 X-Received: by 2002:a05:6a20:3d13:b0:138:2fb8:6c48 with SMTP id y19-20020a056a203d1300b001382fb86c48mr2934695pzi.8.1694615157779; Wed, 13 Sep 2023 07:25:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615157; cv=none; d=google.com; s=arc-20160816; b=V2FH85+5PUYmBVJjBSjmeW8b4h9gTAB7wxMJz+8Cdz3+f5Q/5BvRolBsY7Nyk/zqdJ JKlKddB7oDn+uStQkQRGlk5jPmmejjkxmz9xe7Dj/b1Q2pF8DpAKmuoPqW6APQFDR5SE 0aj3jRY1Q3pGWLpvZwGNaXtaYoDBF/sxv+6/DMuwPgtgTzAMT0gtXLflE8p3MkLVUoST fIbbiZ3i2HCpxHTbwRN/RPyDZ5UVDsu7flPkzlSVHnK7lOEToN8qHohIofFE5cDhRf77 YULcf0wmUBCYTZiSVuNQiNaACXFijnsX0z3D8IhwM1rhkDMza/ontx03i/ut7dad76ww 1eHA== 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; bh=deu0kXij7yXgtHrxfqSJl8vqPL1kCqD+/y8yc9TeSu0=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=EAylrs0IePMh0F4WmAsPNIYKQAxmsy8USYGyPdkbI7RdDvyX+bz0xlZQQ9Jt+8zgCk BrIF/x0U/CIji8yqjl2VPxs8qKS9oWAGRNdyldfUUgrIaxGIkMNk1zjlVF64SNADWzCp KfKnaEvgC3ZlYKZjMZUZW6j3oxotI+Sq4jocm9QCFGQ7fDRBlIWjHBW5jVquz6YBzI68 o0lxnN3rnHplVgPGYIdPe7sK4DBgsihOK2CDmXl8BbA7wW5q1AJHmxg7iC36jIQL6l2f qrggK8Pj9GpDm4MGX995qxNdj3H6Prwp9S1auGZgeyOGWYUDYYQcCb6KuXNPSKx9GnUJ mqxg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id m1-20020a656a01000000b0057416a797ebsi11095363pgu.12.2023.09.13.07.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:25:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id E94CC8023768; Wed, 13 Sep 2023 07:09:05 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241312AbjIMOJB (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241239AbjIMOIz (ORCPT ); Wed, 13 Sep 2023 10:08:55 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E36C1BCB for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by andre.telenet-ops.be with bizsmtp id lS8m2A00J3fvA4V01S8mWg; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cr0-81; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3W-JO; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 02/52] m68k: kernel: Include for trap_init() Date: Wed, 13 Sep 2023 16:07:52 +0200 Message-Id: <42e7055fab50deda1f7cd648982e90b7ab28fdc3.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:06 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932784144536053 X-GMAIL-MSGID: 1776932784144536053 When building with W=1: arch/m68k/kernel/vectors.c:74:13: warning: no previous prototype for ‘trap_init’ [-Wmissing-prototypes] 74 | void __init trap_init (void) | ^~~~~~~~~ Fix this by including . Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/vectors.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/m68k/kernel/vectors.c b/arch/m68k/kernel/vectors.c index 322c977bb9ecfbee..68762fc1dc97b4e1 100644 --- a/arch/m68k/kernel/vectors.c +++ b/arch/m68k/kernel/vectors.c @@ -17,6 +17,7 @@ /* * Sets up all exception vectors */ +#include #include #include #include From patchwork Wed Sep 13 14:07:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138814 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1113727vqx; Wed, 13 Sep 2023 07:10:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IES/Z5RbTHpqsvCjcribrIvWJGnH+cA2KeXV6H8LhQvqVd6DswvcJr+nVCR3zfXmWBr3nCz X-Received: by 2002:a17:90a:1544:b0:273:e073:1d02 with SMTP id y4-20020a17090a154400b00273e0731d02mr2346664pja.38.1694614246108; Wed, 13 Sep 2023 07:10:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614246; cv=none; d=google.com; s=arc-20160816; b=ZicXGXKKjINntx/uXMOf5qM+xmAAmXBFz+a9kz09+1hLy+9Yl3efkNLLbDLZK/YkUu +tO+VNSI+cScvmbcW3lGgZEWRtEuJsTfkyz/Hl9ms0pACqkPwHECt53rg/vuTnr7Ji1i t6BcFxmNOIX3qBtU0CbYseN39dZ3ICHz/hOLAVoHWdamWC0kc7fxw9Lx0Gj8upDAVCwN RbzAkONiJn63IPQxCpMnkmfiJhTla0iwXhIKoVhhW9+4+HsLb+Tag1hgHLKLMMTxHmVc 8Hcs8pBPH8IduQSi9Vdmnzxu2bzSHDU2IV0r54lrdkpjqs0JHCjCiNePQoT4yV/qmZXA QyNw== 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; bh=eIpgsPbuKOkpZepSQhuVXWA+RJL7rMMJBZnrGdpTHts=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=xX1tbKeS1kw/AM96VZaRvoZFsnDIjSH8r0CAq5SvtFavDRUxvaP5+aJLFqb7Eh3C6Z LpDDGoEEo0uOTIPiZm/RB+Y+kRbokH6nnoBF/uox5QodkGGIuxcNVikWo7XHiZq4LEKb jIpDU6NLeajYGgPIuV+4zRK26QaO4fC0wHy/NdLwjCHYwvZRWIgomg3ce3JJCv5Nv5xq 7BG/cCJCFW2DD+SmNRh96Smcark4cMbqQ2730JKNfCLOkei+dEQ03CYS2pfNlmgD9gyX XAB+gz7SiDl6+uFOZ/YMlFjal0UwP/X1gL9jPDLku8DrytSDvpQQiTNo1ieUMuR7w/ZL T2YA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id q12-20020a17090aa00c00b0026b53effbb7si1577173pjp.173.2023.09.13.07.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:10:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id AAADC81B1794; Wed, 13 Sep 2023 07:09:38 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241327AbjIMOJG (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241249AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57D901BD2 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by xavier.telenet-ops.be with bizsmtp id lS8m2A00X3fvA4V01S8m2X; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cr4-9Q; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3b-K9; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 03/52] m68k: kernel: Make bad_super_trap() static Date: Wed, 13 Sep 2023 16:07:53 +0200 Message-Id: <1e0b67a355d7e1bcb40811eced41d3080e8f4d20.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:38 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931827831958299 X-GMAIL-MSGID: 1776931827831958299 When building with W=1: arch/m68k/kernel/traps.c:968:6: warning: no previous prototype for ‘bad_super_trap’ [-Wmissing-prototypes] 968 | void bad_super_trap (struct frame *fp) | ^~~~~~~~~~~~~~ Fix this by making bad_super_trap() static. There was never a user outside arch/m68k/kernel/traps.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/traps.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index a700807c9b6d9999..b3fee39f8f518c6e 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -965,7 +965,7 @@ void show_stack(struct task_struct *task, unsigned long *stack, * real 68k parts, but it won't hurt either. */ -void bad_super_trap (struct frame *fp) +static void bad_super_trap(struct frame *fp) { int vector = (fp->ptregs.vector >> 2) & 0xff; From patchwork Wed Sep 13 14:07:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139019 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6656vqb; Wed, 13 Sep 2023 11:34:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH011m9HNR5Dwv9LQBIIBdxzPmrRf1QtDE91lxoJnGnZG4X9eVgg8bEaqbFd3qLJse2GWJJ X-Received: by 2002:a05:6808:1303:b0:3a8:4dfd:4f14 with SMTP id y3-20020a056808130300b003a84dfd4f14mr4256995oiv.27.1694630091747; Wed, 13 Sep 2023 11:34:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630091; cv=none; d=google.com; s=arc-20160816; b=bse3gH+Ce6bjKMhZLRBQoVLR5q/pGJXobOPy2eGeoqxa4baOi5ZYYxb7QCgzxLgBJf rA93qC/l3UxbSlyXmbLNM1gHqZsUB0FiTo3ZcqnHjnSLI2nhrFXpi3oatbOSQ4a16/HD rp5G8sz3/CamgEy1Uq0vcL096mV0enNEJvO2Ulia54PGEfFYh47KOKr5MM2CXT2gCie+ f2k3wKgMeusX98In7+6c3fmEq0xEOsuJNuItsICxHpvuVX+ZVClHViK7x0/oAIeLUxsB bZtfnBGXPjmPd0LQxQAKxFrBiFwLDyKp4Ch/Y9eW7nHWmUWUi/08eePE3URTRKZxPhEc QR9g== 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; bh=KU/V+LlkguPaR+5sgHqH8OchS6VUHgfqKoOSNHkM6BU=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=cknUYJq5s007VfVLL6hzE9OjLP6/nuPx7OQeISoe6l2thtEVEfuBbEMSfNSgWezvBh yyr5noD2Dzpe5m3CQ0xIFply6ipx1/L+52A/ypTCjGiisdJsWDk0IYizhGGZjYlgzKAG RWzvKyIxKnXpOcXzreAJivNL39X6vXCJmKjGlJUh6RKG35yTLF11WK6XUaB0ZZoHqKuW vBG06jH38gNnOskEmDtUbtcShKowSQQkwFxPnfPnu8mDdlaOkP/cvlSVYXXOZLSVjptX ZJbSefB+kNBqe+UurU+MgLnT8d5knEhVNMoDDTswil10Xuy4z29wcHWWUOb7MMRtsWIi naUQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id b75-20020a63344e000000b0057767db4334si6818519pga.218.2023.09.13.11.34.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:34:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 9423083B009D; Wed, 13 Sep 2023 07:09:06 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241317AbjIMOJD (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241242AbjIMOIz (ORCPT ); Wed, 13 Sep 2023 10:08:55 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A57401BCC for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by andre.telenet-ops.be with bizsmtp id lS8m2A00K3fvA4V01S8mWh; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crA-AN; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3f-L0; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 04/52] m68k: kernel: Add and use Date: Wed, 13 Sep 2023 16:07:54 +0200 Message-Id: <80b721eeb499562cd5d49887b0eee10dd172c88d.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948443042703053 X-GMAIL-MSGID: 1776948443042703053 When building with W=1: arch/m68k/kernel/sys_m68k.c:40:17: warning: no previous prototype for ‘sys_mmap2’ [-Wmissing-prototypes] 40 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | ^~~~~~~~~ arch/m68k/kernel/sys_m68k.c:378:1: warning: no previous prototype for ‘sys_cacheflush’ [-Wmissing-prototypes] 378 | sys_cacheflush (unsigned long addr, int scope, int cache, unsigned long len) | ^~~~~~~~~~~~~~ arch/m68k/kernel/sys_m68k.c:463:1: warning: no previous prototype for ‘sys_atomic_cmpxchg_32’ [-Wmissing-prototypes] 463 | sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, int d4, int d5, | ^~~~~~~~~~~~~~~~~~~~~ arch/m68k/kernel/sys_m68k.c:564:16: warning: no previous prototype for ‘sys_getpagesize’ [-Wmissing-prototypes] 564 | asmlinkage int sys_getpagesize(void) | ^~~~~~~~~~~~~~~ arch/m68k/kernel/sys_m68k.c:569:26: warning: no previous prototype for ‘sys_get_thread_area’ [-Wmissing-prototypes] 569 | asmlinkage unsigned long sys_get_thread_area(void) | ^~~~~~~~~~~~~~~~~~~ arch/m68k/kernel/sys_m68k.c:574:16: warning: no previous prototype for ‘sys_set_thread_area’ [-Wmissing-prototypes] 574 | asmlinkage int sys_set_thread_area(unsigned long tp) | ^~~~~~~~~~~~~~~~~~~ arch/m68k/kernel/sys_m68k.c:580:16: warning: no previous prototype for ‘sys_atomic_barrier’ [-Wmissing-prototypes] 580 | asmlinkage int sys_atomic_barrier(void) | ^~~~~~~~~~~~~~~~~~ Fix this by introducing a new header file for holding the prototypes for m68k-specific syscalls, and including the generic ones. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/include/asm/syscalls.h | 20 ++++++++++++++++++++ arch/m68k/kernel/sys_m68k.c | 1 + 2 files changed, 21 insertions(+) create mode 100644 arch/m68k/include/asm/syscalls.h diff --git a/arch/m68k/include/asm/syscalls.h b/arch/m68k/include/asm/syscalls.h new file mode 100644 index 0000000000000000..6d814ffa2560105d --- /dev/null +++ b/arch/m68k/include/asm/syscalls.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef _ASM_M68K_SYSCALLS_H +#define _ASM_M68K_SYSCALLS_H + +#include +#include + +asmlinkage int sys_cacheflush(unsigned long addr, int scope, int cache, + unsigned long len); +asmlinkage int sys_atomic_cmpxchg_32(unsigned long newval, int oldval, int d3, + int d4, int d5, unsigned long __user *mem); +asmlinkage int sys_getpagesize(void); +asmlinkage unsigned long sys_get_thread_area(void); +asmlinkage int sys_set_thread_area(unsigned long tp); +asmlinkage int sys_atomic_barrier(void); + +#include + +#endif /* _ASM_M68K_SYSCALLS_H */ + diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index c586034d2a7ac85d..14055d676161d725 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include From patchwork Wed Sep 13 14:07:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6783vqb; Wed, 13 Sep 2023 11:35:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGyTvXx/+UYOJZRroX+9qqkaT9mmBvsZiEonGVfQOc08X0XimCZsdxj8sCvloXaFC1M6Ghc X-Received: by 2002:a05:6870:2489:b0:1cc:e169:96bf with SMTP id s9-20020a056870248900b001cce16996bfmr3353788oaq.39.1694630103470; Wed, 13 Sep 2023 11:35:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630103; cv=none; d=google.com; s=arc-20160816; b=ZgmfSDHbZTgjtaURNzE9KyOFtet9bbcBQPx9ZShQz07LzsQ4j6I0LjBcuqW+8gQcBV XzJNkvPYYrhP4ErKu/vhdBCE2r4yWPUlzQUI1h5poMebPFgGRDmi0DSKXo/ZnDFu/6mF cpF3fd7gyzfqTKUUt8sYSBlC43ZNjOPNYnk7OYY6saa1aduWVQpTTEjr50KWRUxCenjw iwZnBcwoqrXdAOkjzOySWaFffeEgvSjhotTe3lIJzewm7WkSlK9emnf2/so37OmChqww Jap/MUbCjQLMEYgJYqN0PziHznwhdcTxvv8z0YgU87o0FkWYsjt/3iVtSsxyQ5alramN o4aA== 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; bh=q30ZJMp7OPiFiA7kdlc7KlMuNURa5ZKNus38R96hKwY=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=1DyvzfjDuTtNL/J1BczkLXvtVtyUEfghSmW9EH04xYyp4jSR3ysEHVs8JROxNiON1z 1iOYKViB7wjYvfNVoqme0sZIYp4tbmbwNwjkkiJ4/qe2o3w8YyX5HR4wu5ICWyS4ouXp Ln5AsDDcx+oGCp1mljNTSaS+/hO1HdsBLDCC7C+Z1w6LliZKxZwfTt1t4WAxFnTMDsxi 4tYBW1MB65BIaorbOT92Edz8VMYlh1sb8a1C8mJ4AKE48avY6Q3d+Jgf+AOJ8l5FHYd3 GUetMiOz+vWZ4VEzuNfbiaFg0zDTg2sGr/hMtmkyf2aV1mMp5tOwgsbHDn+gqtdpxmmz /vkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id x5-20020a63fe45000000b0056fa1bc208esi10620061pgj.722.2023.09.13.11.35.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:35:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 1CC0383E5AD1; Wed, 13 Sep 2023 07:09:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241357AbjIMOJP (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241248AbjIMOIz (ORCPT ); Wed, 13 Sep 2023 10:08:55 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57BC51BCF for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by baptiste.telenet-ops.be with bizsmtp id lS8m2A00P3fvA4V01S8mqA; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crF-BD; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3j-Me; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 05/52] m68k: kernel: Add and use "ints.h" Date: Wed, 13 Sep 2023 16:07:55 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:19 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948455213728589 X-GMAIL-MSGID: 1776948455213728589 When building with W=1: arch/m68k/kernel/ints.c:165:17: warning: no previous prototype for ‘handle_badint’ [-Wmissing-prototypes] 165 | asmlinkage void handle_badint(struct pt_regs *regs) | ^~~~~~~~~~~~~ Fix this by introducing a new header file "ints.h" for holding the prototypes of functions implemented in arch/m68k/kernel/ints.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/ints.c | 2 ++ arch/m68k/kernel/ints.h | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 arch/m68k/kernel/ints.h diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 5b8d66fbf3832a2c..cf2b13488476c8c6 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c @@ -26,6 +26,8 @@ #include #endif +#include "ints.h" + extern u32 auto_irqhandler_fixup[]; extern u16 user_irqvec_fixup[]; diff --git a/arch/m68k/kernel/ints.h b/arch/m68k/kernel/ints.h new file mode 100644 index 0000000000000000..ecac6011c1a45489 --- /dev/null +++ b/arch/m68k/kernel/ints.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include + +struct pt_regs; + +asmlinkage void handle_badint(struct pt_regs *regs); From patchwork Wed Sep 13 14:07:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138824 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1119993vqx; Wed, 13 Sep 2023 07:19:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGvKaZIWw4N6fjslVBLz9aJXPxQoM8c58RNaNKkqhkbritRXgNU9ETBnW2X17a4SQlCBvVg X-Received: by 2002:a17:903:2442:b0:1bd:d911:2a85 with SMTP id l2-20020a170903244200b001bdd9112a85mr3425718pls.12.1694614764808; Wed, 13 Sep 2023 07:19:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614764; cv=none; d=google.com; s=arc-20160816; b=HLWN5oMEVY6ZUovDw7EOL/4sRlnMZHoNi02bH67/unQ1rJZjkiKijkDn2LA/zR3NA9 6a8n4YFgH+8lWb4D9GL2RhtvLmO3Y4P53MPrMoc5qmvswRYKPwI92nEMyWdxz70atK+j mCLgUl5hXbbH7L4/xW6HTDK7puk3llSV5KYeY13XE9wuAGAZS7Rq3DxAQfQ1gpWzGnqM R9SMrmOEGdRzSMDZ8ln17K6gHxF5Z2eAkuj32sEAWdu05SrIg0i01d2QO+HOWjkGnxVF TE3CUJuF2Vyizf39JLSRUDNL/R5HGTJTP8/tx2wGqIAXkAtr1eZ6UcvjkXfyO2m76KvK o21g== 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; bh=4OXRyvy7Qe7FNZ4FTKL3htIlUD+8XlxjsxTzw2D2Djw=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=IZY9WSz/FvsFga/4toXP6zKqOAuvXjGtrB8DqooHNMl2sVc4d7XF2ZqF5sGc20f17e nP6ylTapkSsnMATUyqJHQLUmVcWJQhJifSU8B0hQekRna4lj+X+hxYfxrLJCQKCFiTJ3 QpVeFv7gzGmHirVf9DTwlxaa3A8NrZzdkcuHh2lbogpqlKK4fcM4udHdN1MJyGC39m3L 6Ud++oE3Av4GO2DvYh/X9QxiFloe8cGe58Sh+u34PcsTsbIT+y/AS+nu559UbVSFzqPj h7hkS9J9cSMmkXOMKKZvxels6EOowgXWBepTyv4BtQfVMSflnrTDB5/VFJ3GZ1ZlJ9gm t/5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id k12-20020a170902d58c00b001c1f1394bf9si10465768plh.357.2023.09.13.07.19.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:19:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id B607A80C0A69; Wed, 13 Sep 2023 07:10:58 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241472AbjIMOKl (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58264 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241440AbjIMOJq (ORCPT ); Wed, 13 Sep 2023 10:09:46 -0400 Received: from riemann.telenet-ops.be (riemann.telenet-ops.be [IPv6:2a02:1800:110:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 719D51FFA for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by riemann.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF3ThVz4x2vy for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by andre.telenet-ops.be with bizsmtp id lS8o2A00A1C8whw01S8oWs; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crJ-CL; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3p-Nc; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 06/52] m68k: kernel: Add and use "process.h" Date: Wed, 13 Sep 2023 16:07:56 +0200 Message-Id: <5e50257d8fcae3eb202ce5f439dc29c09cb6c44f.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:58 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932371762110741 X-GMAIL-MSGID: 1776932371762110741 When building with W=1: arch/m68k/kernel/process.c:115:16: warning: no previous prototype for ‘m68k_clone’ [-Wmissing-prototypes] 115 | asmlinkage int m68k_clone(struct pt_regs *regs) | ^~~~~~~~~~ arch/m68k/kernel/process.c:136:16: warning: no previous prototype for ‘m68k_clone3’ [-Wmissing-prototypes] 136 | asmlinkage int m68k_clone3(struct pt_regs *regs) | ^~~~~~~~~~~ Fix this by introducing a new header file "process.h" for holding the prototypes of functions implemented in arch/m68k/kernel/process.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by, - Include "process.h" instead of , to fix in-tree builds. --- arch/m68k/kernel/process.c | 1 + arch/m68k/kernel/process.h | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 arch/m68k/kernel/process.h diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index e06ce147c0b7fcf2..2584e94e213468f1 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c @@ -38,6 +38,7 @@ #include #include +#include "process.h" asmlinkage void ret_from_fork(void); asmlinkage void ret_from_kernel_thread(void); diff --git a/arch/m68k/kernel/process.h b/arch/m68k/kernel/process.h new file mode 100644 index 0000000000000000..d31745f2e64bebab --- /dev/null +++ b/arch/m68k/kernel/process.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +struct pt_regs; + +asmlinkage int m68k_clone(struct pt_regs *regs); +asmlinkage int m68k_clone3(struct pt_regs *regs); From patchwork Wed Sep 13 14:07:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120707vqx; Wed, 13 Sep 2023 07:20:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGWKojmukxPtR7bONhoSqLG3/2j71N50kKFA+p+wP6d4I1zWeRZ2hT1xRCCIkJIccAbiRA X-Received: by 2002:a05:6a20:4321:b0:14c:c986:d105 with SMTP id h33-20020a056a20432100b0014cc986d105mr2934385pzk.45.1694614827658; Wed, 13 Sep 2023 07:20:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614827; cv=none; d=google.com; s=arc-20160816; b=ohf6EGOyxUYw2Byh02Irp8iNHA58xnSau19k39QvZErhG3xmj/RIq/+w9rTn8QRb5R J3XRpBgI4HxlJ13dI/LQK3tIg59+MTLENowC4dOiXPbbJbhJhZZMWMS3eBZVdshE/NyW nmvzuRgM90U8CiJ7LwesdB89JZMo/omn+mqcF//PfYgbqi+gO7Efi9kL2trvX+InFaw+ FKAjBdmd/taCmA6oj6SUV/6me+1qSfEDlipk+UffOEsza/VLHZwMf3//Eh6Valpw64Rg jEI5ghku+1uLsA014Nx/4tMsadI1p8ttN2ouCNAeCes0q8EAndsxNx/+J9/AQQ7gqZeY 4sRQ== 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; bh=+4KbfuGfVcLq6A1P08pLiUL7du8Lq+d3K50mT2rA46I=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=UAmpPLhunRo13r+csvdqkqYE85jVfsXOMkoAByHZRHRo7nPhRvo0tXMHUu2Sm2iRDL 3+NdUuOR/y9J8uA2gFyYQo1Hnl0SWzAN3o6Fgez9W+23HEKtZfBdjK54OmD9aeqFFX2d 8375hwJ+iZUYob63GXXYgd7r0O7V3Z3EXJTVEwi933FBkZPYaOddTsJTeSHS2q3F2l10 6qqSsMpnojvF/fg9bOMI+TrRlSlC6VFRurq+rcw9cTGYw+oh9jg4LwbHODjRdP+/OyyR 1dbFuMMriAlOOYBzQ9GFu96TTxx8jdRu48lP3CvLpAkl0iNKmCqd9ZJBSNflF6fPkghD 6lsQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id p26-20020a631e5a000000b00569fd44093csi989939pgm.50.2023.09.13.07.20.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id CD3208059E47; Wed, 13 Sep 2023 07:08:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241306AbjIMOJA (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241237AbjIMOIz (ORCPT ); Wed, 13 Sep 2023 10:08:55 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 711301BC8 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by andre.telenet-ops.be with bizsmtp id lS8m2A00L3fvA4V01S8mWi; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crN-DB; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3u-OU; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 07/52] m68k: kernel: Add and use "ptrace.h" Date: Wed, 13 Sep 2023 16:07:57 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:08:59 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932437426175173 X-GMAIL-MSGID: 1776932437426175173 When building with W=1: arch/m68k/kernel/ptrace.c:275:16: warning: no previous prototype for ‘syscall_trace_enter’ [-Wmissing-prototypes] 275 | asmlinkage int syscall_trace_enter(void) | ^~~~~~~~~~~~~~~~~~~ arch/m68k/kernel/ptrace.c:288:17: warning: no previous prototype for ‘syscall_trace_leave’ [-Wmissing-prototypes] 288 | asmlinkage void syscall_trace_leave(void) | ^~~~~~~~~~~~~~~~~~~ Fix this by introducing a new header file "ptrace.h" for holding the prototypes of functions implemented in arch/m68k/kernel/ptrace.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/ptrace.c | 2 ++ arch/m68k/kernel/ptrace.h | 6 ++++++ 2 files changed, 8 insertions(+) create mode 100644 arch/m68k/kernel/ptrace.h diff --git a/arch/m68k/kernel/ptrace.c b/arch/m68k/kernel/ptrace.c index cd0172d294306d10..c20d590e429703e9 100644 --- a/arch/m68k/kernel/ptrace.c +++ b/arch/m68k/kernel/ptrace.c @@ -26,6 +26,8 @@ #include #include +#include "ptrace.h" + /* * does not yet catch signals sent when the child dies. * in exit.c or in signal.c. diff --git a/arch/m68k/kernel/ptrace.h b/arch/m68k/kernel/ptrace.h new file mode 100644 index 0000000000000000..77018037f10f9781 --- /dev/null +++ b/arch/m68k/kernel/ptrace.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include + +asmlinkage int syscall_trace_enter(void); +asmlinkage void syscall_trace_leave(void); From patchwork Wed Sep 13 14:07:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120529vqx; Wed, 13 Sep 2023 07:20:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrWfM1FKufSprYE7F7S37Z2lXAKYubruRMeSRzfbMksLzJYZkvQtUAEEWUMqtKUD7cKDjO X-Received: by 2002:a05:6300:8085:b0:136:ea0e:d23 with SMTP id ap5-20020a056300808500b00136ea0e0d23mr2159969pzc.11.1694614810121; Wed, 13 Sep 2023 07:20:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614810; cv=none; d=google.com; s=arc-20160816; b=cWk1A4KaUV4r6ILHser4VYnUI2pKvpD6A3hF8P9Y0QJXJlf1y0C9yJtF19/20Z9z3x xRyG5IsBWLZH3sf9LdhZa2Xgp1KeHUQSm73WbkQqEBxwS9zvGbl5hZcmprrP06RGTgHS SZ5IJmrFeQQ7MNAfAe8mdZ7qtPfEQLTV7hwUr05zK5ksUAOkpXR25fBTvENOy4puCjf3 bDRK8py1MMEsxIdfDPucsrjgIqIHeJZR5psjDgnSGJuAcpGQbqfKE0FW64MmlhknZ2qv saij8ABDBVcnNk4INRrv6Ig2Mi1/+msfZ3CxFthnxR421fFqYEzPmaOqtoJMIzT/vwsl NXTw== 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; bh=RlKahighAgYKbBDUSo7uiL+BQbSsdMacsBnPgToiEyI=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=mhHSCDtzGqAzErlU9qZ+lWVisbcZn6M0Vl4Sua5Sf9a54QjcA1PEAy9FTxHpTpvIZ8 q+YVe6QOZ0/fepGX+9ZhqQQaGPfhdA1qoN6Z2ptMveOcE3RkmP+1NxBBaXByPj8FAvBo Zo7b88PJ/WYFHgUzp/Tbjz8Ugn9b05iojF5iWn/0hSQsvg2gkUZ0cuOqe4UL2swr/yia aceVvJkpjVxgafbct7o/XO5kaqovwa3l7EHhglFBWDpUpFHvW7BGOs8KnCx7O9WfoQE6 DYoRvhTbJl+9MffgJEkflvI4DTMUa76RWskfpxONk1rD0fPTq8zZ3NCePWjZPqP92cv6 4o4g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id m7-20020a056a00080700b0068fb1a85ec8si7482392pfk.370.2023.09.13.07.20.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id DCDA0804ACC3; Wed, 13 Sep 2023 07:09:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241389AbjIMOJZ (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52928 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241277AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8D591BE4 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by xavier.telenet-ops.be with bizsmtp id lS8m2A00f3fvA4V01S8m2Z; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crP-Dv; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV3z-PK; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 08/52] m68k: kernel: Add and use "signal.h" Date: Wed, 13 Sep 2023 16:07:58 +0200 Message-Id: <25cecda80698829cec18721a9d0f058cc69df0cc.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:30 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932418795875470 X-GMAIL-MSGID: 1776932418795875470 When building with W=1: arch/m68k/kernel/signal.c:756:18: warning: no previous prototype for ‘do_sigreturn’ [-Wmissing-prototypes] 756 | asmlinkage void *do_sigreturn(struct pt_regs *regs, struct switch_stack *sw) | ^~~~~~~~~~~~ arch/m68k/kernel/signal.c:783:18: warning: no previous prototype for ‘do_rt_sigreturn’ [-Wmissing-prototypes] 783 | asmlinkage void *do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw) | ^~~~~~~~~~~~~~~ arch/m68k/kernel/signal.c:1112:17: warning: no previous prototype for ‘do_notify_resume’ [-Wmissing-prototypes] 1112 | asmlinkage void do_notify_resume(struct pt_regs *regs) | ^~~~~~~~~~~~~~~~ Fix this by introducing a new header file "signal.h" for holding the prototypes of functions implemented in arch/m68k/kernel/signal.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/signal.c | 2 ++ arch/m68k/kernel/signal.h | 7 +++++++ 2 files changed, 9 insertions(+) create mode 100644 arch/m68k/kernel/signal.h diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c index 459c5ff69fcfa126..e628b859ef21beaf 100644 --- a/arch/m68k/kernel/signal.c +++ b/arch/m68k/kernel/signal.c @@ -51,6 +51,8 @@ #include #include +#include "signal.h" + #ifdef CONFIG_MMU /* diff --git a/arch/m68k/kernel/signal.h b/arch/m68k/kernel/signal.h new file mode 100644 index 0000000000000000..498d84f828202541 --- /dev/null +++ b/arch/m68k/kernel/signal.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include + +asmlinkage void do_notify_resume(struct pt_regs *regs); +asmlinkage void *do_sigreturn(struct pt_regs *regs, struct switch_stack *sw); +asmlinkage void *do_rt_sigreturn(struct pt_regs *regs, struct switch_stack *sw); From patchwork Wed Sep 13 14:07:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139023 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6860vqb; Wed, 13 Sep 2023 11:35:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGuN42gEBXqtyzKI6C3A7Xt84NzsNNVDX23iaTj1fJLtM7ErGOD6LioUTqpDpPVZXL6TMKE X-Received: by 2002:aca:2119:0:b0:3a7:6b1c:8137 with SMTP id 25-20020aca2119000000b003a76b1c8137mr3250660oiz.39.1694630112582; Wed, 13 Sep 2023 11:35:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630112; cv=none; d=google.com; s=arc-20160816; b=tM9TU6ITvRmORs9eH22dAYFtW6j+GhqaGstJRDZQFjtWib8qvPiywhstQROjstOMCI KGCJLKQhLBqbjJ2cGH4v0ovsZ0Kz20lVjrLLu4WIItyl3H7xJzs5S8aA9sCBOtbZVbzA keeBvS2M6m8KmFZ+tOxO1ETaciX/9WLY+NHqGbDpnPLZv261gw6WtnF3G/B05B2YZWo3 vbFS1Os2BK/XZGt5M43NGpxfgbkS0NC+EsIRdXl8581oUcMFP5yc6bmc4LPFgBlxvzqg 3gavQDH46aQ/5YSovoplDjh8oLJShg6CcWTsthN/MA1yoG0tGKz5MmZKdu/VjGxRFR1G a/GQ== 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; bh=b32shfJ0pQ6fvEUR9OS7FvfsS1RlBO5pvNdgdO476vM=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=HMT4HHsoZjNkJNe60WXz9In4jfWJNz0vpDZhFBSvhOh4pZUg9KK960dfqTiAa+yToV KJpoJlBnuspkX6u8y1Eglr0UYrBF66/pcEPP+6Vy62Lq/7kEf1Dp7+43vq3WufqRuHGH gmHKN+81GCcwLH++92Tp8n3lxM2xY+wLvwDpXTnfcWL9f9BUlkd34m3V5sa4u1NzaDzz bxdLMS1pTGSWD4Cr2G6rbpsfRlAQEgzRw9AImBk5C4kLx/8AVpF3TY3zQPRLNm8amCDy ubTx0np8XzF1hdD8gvLqhkAieEJSCKu3u3KVUE+Vu6k+nHatjC9V8QxO7+VNz5Z7Yk8s nz6A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id q128-20020a632a86000000b00577568210a1si7294153pgq.539.2023.09.13.11.35.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:35:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 5EB2583E8FF2; Wed, 13 Sep 2023 07:09:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241381AbjIMOJX (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241276AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F87A1BE3 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by xavier.telenet-ops.be with bizsmtp id lS8m2A00g3fvA4V01S8m2a; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crS-El; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV44-Q9; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 09/52] m68k: kernel: Add and use "traps.h" Date: Wed, 13 Sep 2023 16:07:59 +0200 Message-Id: <652cbbb1c9e339980a86068ebdd0a69362324af8.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948464733444066 X-GMAIL-MSGID: 1776948464733444066 When building with W=1: arch/m68k/kernel/traps.c:754:17: warning: no previous prototype for ‘buserr_c’ [-Wmissing-prototypes] 754 | asmlinkage void buserr_c(struct frame *fp) | ^~~~~~~~ arch/m68k/kernel/traps.c:1140:17: warning: no previous prototype for ‘set_esp0’ [-Wmissing-prototypes] 1140 | asmlinkage void set_esp0(unsigned long ssp) | ^~~~~~~~ arch/m68k/kernel/traps.c:1155:17: warning: no previous prototype for ‘fpemu_signal’ [-Wmissing-prototypes] 1155 | asmlinkage void fpemu_signal(int signal, int code, void *addr) | ^~~~~~~~~~~~ arch/m68k/kernel/traps.c:1149:17: warning: no previous prototype for ‘fpsp040_die’ [-Wmissing-prototypes] 1149 | asmlinkage void fpsp040_die(void) | ^~~~~~~~~~~ Fix this by introducing a new header file "traps.h" for holding the prototypes of functions implemented in arch/m68k/kernel/traps.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/traps.c | 2 ++ arch/m68k/kernel/traps.h | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 arch/m68k/kernel/traps.h diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index b3fee39f8f518c6e..d408334712f7118b 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -41,6 +41,8 @@ #include #include +#include "traps.h" + static const char *vec_names[] = { [VEC_RESETSP] = "RESET SP", [VEC_RESETPC] = "RESET PC", diff --git a/arch/m68k/kernel/traps.h b/arch/m68k/kernel/traps.h new file mode 100644 index 0000000000000000..6414b4a0e5585671 --- /dev/null +++ b/arch/m68k/kernel/traps.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include + +struct frame; + +asmlinkage void buserr_c(struct frame *fp); +asmlinkage void fpemu_signal(int signal, int code, void *addr); +asmlinkage void fpsp040_die(void); +asmlinkage void set_esp0(unsigned long ssp); From patchwork Wed Sep 13 14:08:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138843 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1121037vqx; Wed, 13 Sep 2023 07:20:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGB7EbTnjnGUY05/apY4I1vhYUIFot1ADwLuD3tk0uNhuEqxppRXW1fy0gew8K4sVpBy1F5 X-Received: by 2002:a17:902:ea01:b0:1bd:b8c8:98f8 with SMTP id s1-20020a170902ea0100b001bdb8c898f8mr3430931plg.4.1694614851139; Wed, 13 Sep 2023 07:20:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614851; cv=none; d=google.com; s=arc-20160816; b=bdwRpejJ2ObfoH9AIuqLdlyvEYbvqzZG1nfedqsKv8yTVytVyfPI5o6OrnpQ1mTDbE SzfpZ+9/Dt2QbNb/7wLVaroUmdxEzxuzKnnivmrRaZWCm+xr5WN73Asd1svFPPrvMpoE ZH2531E2OWQn3pU7UV6tf+1Dnyll2bMq+jfHZGKJ26td4d0jnduIV9rVbMcST2YVDJ0s h4Is4DhPE76KbS4Een87Kb2Rtk7v0jb36vTrZDNbHaI6YB0wl4buDvT5T0A3FQ1UQx7A 6+m8ifX1+zXptAVZHURPXz5bk6rDikuKlnsN3QaHCzK7JM55yuTrddDmxhnHtnNKvraw 99iw== 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; bh=25ES+xcNa/ZinCzxzAg5tyjq4f1ivEBP/VDmT0dK/LQ=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=CCO5jUq53f2nh0JvOlzhsRRQreUYN/nkxF4vlILsw8YLo0SpVLjsrizTYz+tLfBye4 8deJ67YCBa7K87qHcpruK460XQhs+aglNHlCkrwYW4Atp8Ey8dEjAK/N9zX71B9Mu9xq QBo9zAJJMiiEO6raUd/DDuzEJ8wZ8+POvjMhmSCY65qzGTTpq110EkPTUspJ1hWVBJj6 G6fyTQSeQhTNBMhHBxl+bKnMasrBrZQJvwqVGofDGBAREkqYn8rXbOE+aEEKZeSQnu5d U9NFwDx/i1nwJZm6Yfly+jtxuvTkUGaFCiK8o55X7EiaEqLUPGLnWhlceHPmV6hzagva AF6w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id kb14-20020a170903338e00b001b85ca73574si9928308plb.285.2023.09.13.07.20.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A07E180C0385; Wed, 13 Sep 2023 07:10:14 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241462AbjIMOKG (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241344AbjIMOJO (ORCPT ); Wed, 13 Sep 2023 10:09:14 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 922781FC8 for ; Wed, 13 Sep 2023 07:08:52 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8m2A00l3fvA4V06S8n43; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crX-FW; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV49-Qz; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 10/52] m68k: kernel: Add and use "vectors.h" Date: Wed, 13 Sep 2023 16:08:00 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:14 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932462272318833 X-GMAIL-MSGID: 1776932462272318833 When building with W=1: arch/m68k/kernel/vectors.c:52:13: warning: no previous prototype for ‘base_trap_init’ [-Wmissing-prototypes] 52 | void __init base_trap_init(void) | ^~~~~~~~~~~~~~ Fix this by introducing a new header file "vectors.h" for holding the prototypes of functions implemented in arch/m68k/kernel/vectors.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/vectors.c | 2 ++ arch/m68k/kernel/vectors.h | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 arch/m68k/kernel/vectors.h diff --git a/arch/m68k/kernel/vectors.c b/arch/m68k/kernel/vectors.c index 68762fc1dc97b4e1..667e848070f4d3d7 100644 --- a/arch/m68k/kernel/vectors.c +++ b/arch/m68k/kernel/vectors.c @@ -28,6 +28,8 @@ #include #include +#include "vectors.h" + /* assembler routines */ asmlinkage void system_call(void); asmlinkage void buserr(void); diff --git a/arch/m68k/kernel/vectors.h b/arch/m68k/kernel/vectors.h new file mode 100644 index 0000000000000000..897330737ec570a5 --- /dev/null +++ b/arch/m68k/kernel/vectors.h @@ -0,0 +1,3 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +void base_trap_init(void); From patchwork Wed Sep 13 14:08:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138819 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1117374vqx; Wed, 13 Sep 2023 07:15:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHXn8SjInWlYQ+f7XcoXqHksgYgNX1Ec7gujRD2qgCvyRTV3I/QSje9dNrZ0dWlbRZQobF X-Received: by 2002:a17:902:d2cd:b0:1c3:ed30:ce06 with SMTP id n13-20020a170902d2cd00b001c3ed30ce06mr1302143plc.17.1694614549071; Wed, 13 Sep 2023 07:15:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614549; cv=none; d=google.com; s=arc-20160816; b=0iPcmKCLVPSEkeFrwD75AoyKwHoICSeKpTT9r0U0Bovu/+OQhOovqbPVoqXBgkZN6/ T65JGtQT9xAsvFGYepofqjmDU4Yrmdh282UA2rdZYEqwRQ5/KkLzEN+aaGhH7HEyo0FG NqBu72x/stgsc5kEDXa5kZNb9TTzQkJDdj82OnuYKSsseUqj1MnPr1Y10JPKVyUr0A8i HEZDelncXq8GkBkO9OZlUvwKStH2osT3AG4zNF4iPSNtIRlnFFOazlQQCvW1Wag28Ggj q3KGJRE1jAlDx0hhf5SSnHlsKHrbUF75B/lv22owaruqKYx9KhjyQaTBcV0xNGfbP/Wu DVTA== 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; bh=VxJCcOfRrpUr2/YLTho5FG6dcaeNbPuiPqUSsV84Hik=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=OB6neyVw0REE4atCDWNybDsrA5jLsYunRlS+Gaiax/doA8fcMineuL7nQEGKTPRMM4 0BtUEQrinHnKRucluySWZW1L3/ScGE/qcaFkqWdwo8z17iNzElnsGPxApH8r+6q3svri 5KXSP0PBZlxQtE+DqlV4/Hhi/oCG2th0a16QkC8k9FzFakstgESCLxJitMPel6g+XFav SEVCTZr/CH5jViA1Q7/EPGSUEJ+d4uo+ra4hb4awknKTiCDNZbVzIAfWcw9lo5maeV2J RI9nimtquJ8ZLeRmTn1sLw94Jm0yaODHMiKv9QvyeSoR7B0BlEkc7z7y8P7/h10P9tpw NvJQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [23.128.96.31]) by mx.google.com with ESMTPS id z1-20020a170903018100b001bb3406a5f7si10729108plg.11.2023.09.13.07.15.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:15:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id A915680225A2; Wed, 13 Sep 2023 07:10:22 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241535AbjIMOKN (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53866 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241356AbjIMOJP (ORCPT ); Wed, 13 Sep 2023 10:09:15 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B4A2D1BD0 for ; Wed, 13 Sep 2023 07:08:52 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8m2A00m3fvA4V06S8n44; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cre-GK; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV4E-Rl; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 11/52] m68k: mm: Include for hwreg_() Date: Wed, 13 Sep 2023 16:08:01 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:22 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932145340202031 X-GMAIL-MSGID: 1776932145340202031 When building with W=1: arch/m68k/mm/hwtest.c:29:5: warning: no previous prototype for ‘hwreg_present’ [-Wmissing-prototypes] 29 | int hwreg_present(volatile void *regp) | ^~~~~~~~~~~~~ arch/m68k/mm/hwtest.c:62:5: warning: no previous prototype for ‘hwreg_write’ [-Wmissing-prototypes] 62 | int hwreg_write(volatile void *regp, unsigned short val) | ^~~~~~~~~~~ Fix this by including . Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/mm/hwtest.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/m68k/mm/hwtest.c b/arch/m68k/mm/hwtest.c index fe99aa99987e9c38..8ee7a336868868bb 100644 --- a/arch/m68k/mm/hwtest.c +++ b/arch/m68k/mm/hwtest.c @@ -26,6 +26,8 @@ #include +#include + int hwreg_present(volatile void *regp) { int ret = 0; From patchwork Wed Sep 13 14:08:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138845 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1121304vqx; Wed, 13 Sep 2023 07:21:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IElRqxELYmYcZa+GSDQSJ0cx+H9NkF2TgG64qm1aH7vRJqKgfThzaEyeAWdzOZtA9dL6oJw X-Received: by 2002:a05:6870:9726:b0:1d5:b9e1:d378 with SMTP id n38-20020a056870972600b001d5b9e1d378mr3089469oaq.24.1694614877743; Wed, 13 Sep 2023 07:21:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614877; cv=none; d=google.com; s=arc-20160816; b=kzUd9rg8aEQcrwinmZY/wjBxv6TNg1cTgCyHMYjTwD8SC4S+N99HcG9YoIXmVtu81g Yw56NZQcigxJC97vxiqXMyWLA+kaVCetUjmTCzbgboOolBUWbXdih8M63PGjmLmjQOd1 veRCd1Nt/WtiY4z5Q48mgdfXweL73vhBTOyt72wU85P1lVU0/67fZDmV4qE8y5sQ3uW8 M+L0oI/4j8zd8sPYrkTBO5w5y9YtP/oOm/TMy/8uSLHqEnM16wGe9kRyKHTqp1q+xZD7 LpjxCo3DTFN9W3c8iRWub1uWD9lrICQz3fIZabCKdv1KyYjBhwrI/Xd5M8lRvwxC/6NV Epig== 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; bh=El2CMeGdQ7jvAyzoQFzL9i1IQefI14/i69w6ZarIcvs=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=TlbxqCzVBeFP9Gl7PmDAC6Ew9CpikUdoqsbTqsBSMwobrWVrIH2MXjhMu6dUK0XxG0 UCO/JjBNCyrOO2/V6Hqd3g+k+vInnQ7Bhu5kIRlYmFEYlD9HZMUxnbq3wlDFDLa2lnDp MT5MQenxAv3mBt08HNkU3S3YCZe3xmgNMBVkuq9AUNvXkUCsOY0loDpv2PjSTpch5Pt6 LBVL675jWDSSGnjgwT1FaVDFRGIsgohU5BLC8SHpHsUkUJ1uPPrbxzvKUwGiLQp1UCl7 hRt3vYQW7YwtC/Gw/KXBtQtF7xYP6jLID20INaabKYpNKv4G9gLcfwjLtLnAIfClLd56 jJVw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id 63-20020a630142000000b00565d4a437b5si10125155pgb.631.2023.09.13.07.21.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:21:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id CDD8B80417D1; Wed, 13 Sep 2023 07:09:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241321AbjIMOJE (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241233AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 57E2B1BD3 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by xavier.telenet-ops.be with bizsmtp id lS8n2A0023fvA4V01S8n2c; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crh-H7; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV4I-SY; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 12/52] m68k: mm: Move paging_init() to common Date: Wed, 13 Sep 2023 16:08:02 +0200 Message-Id: <1b03fde54f205e972e19959b8e335022205d538c.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:18 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932490181631433 X-GMAIL-MSGID: 1776932490181631433 When building with W=1: arch/m68k/mm/motorola.c:414:13: warning: no previous prototype for ‘paging_init’ [-Wmissing-prototypes] 414 | void __init paging_init(void) | ^~~~~~~~~~~ arch/m68k/mm/sun3mmu.c:36:13: warning: no previous prototype for ‘paging_init’ [-Wmissing-prototypes] 36 | void __init paging_init(void) | ^~~~~~~~~~~ Fix this by consolidating the multiple prototypes into the common . Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/include/asm/pgtable.h | 9 +++++++++ arch/m68k/include/asm/pgtable_no.h | 1 - arch/m68k/kernel/setup_mm.c | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/m68k/include/asm/pgtable.h b/arch/m68k/include/asm/pgtable.h index ad15d655a9bfb3b5..27525c6a12fd0c7f 100644 --- a/arch/m68k/include/asm/pgtable.h +++ b/arch/m68k/include/asm/pgtable.h @@ -1,6 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __M68K_PGTABLE_H +#define __M68K_PGTABLE_H + #ifdef __uClinux__ #include #else #include #endif + +#ifndef __ASSEMBLY__ +extern void paging_init(void); +#endif + +#endif /* __M68K_PGTABLE_H */ diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h index fc044df52b96c149..1a86c15b9008f03d 100644 --- a/arch/m68k/include/asm/pgtable_no.h +++ b/arch/m68k/include/asm/pgtable_no.h @@ -28,7 +28,6 @@ #define PAGE_READONLY __pgprot(0) #define PAGE_KERNEL __pgprot(0) -extern void paging_init(void); #define swapper_pg_dir ((pgd_t *) 0) /* diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 6f1ae01f322cf231..10310b04f77d8d79 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -107,8 +107,6 @@ EXPORT_SYMBOL(isa_sex); #define MASK_256K 0xfffc0000 -extern void paging_init(void); - static void __init m68k_parse_bootinfo(const struct bi_record *record) { const struct bi_record *first_record = record; From patchwork Wed Sep 13 14:08:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139013 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp4113vqb; Wed, 13 Sep 2023 11:30:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IESHzXbcVkzuxkZuQ64/mnMUmt06IU3Bzdw0cD1w4dZCRTb442N+pTPKmxBPi0+4Bu6CDAh X-Received: by 2002:aa7:8881:0:b0:68f:d4fe:6344 with SMTP id z1-20020aa78881000000b0068fd4fe6344mr4228759pfe.0.1694629818537; Wed, 13 Sep 2023 11:30:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694629818; cv=none; d=google.com; s=arc-20160816; b=QqzPZxm5+xiJE4Y3vhdzlrIL7oy/8Dvs6KBfUn+Si6bhoTURTfCTZt2a3KwgsIfl/X o1+AtLNp5XNzkX7U2KSdiWey5yfJe4sDy6dpvcyiffjxvUatbPJAbV9q68nH8FkjiWnn awKKCS+dHfsrftLbgpx+QhtZ3vcvPEgpY54QYba+bwBgFLUW7KpY3zyYAsbAtVPEu4JC /QBizuQDzLi84241SmaKoZukSGKYxgDRuhMmgaJ6+mnlgkyQ1cpqcUBFXGfY5KcQpkGo 4lXHPSQVb05Zc9kV31aTc4isZHnQhf9wsLuugOIF7c1qmp1Nq2jJykWanAmI35h0jJgw ihbw== 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; bh=znDARCDOVM7WNpoH3R58I/uKck5F7wXyBfdI5X3+/qc=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=sDpiyewNHhYiNExY3ibk6qRiILo3aSzmCjBveO7WXlgmLBhuZfyIU3CkR9mOo7+la3 36TjUJ3mA2IwbE4rkoE1mGVOCAmfgMmCnzNOa7JRj3YLMh02gp7juhgFmBCb8GuEJPnv FrfbuXL7gUpsn6BE6CLzWApvJ0abTt9RIlPuu7xSdDqIRQGTJb7XahcHB5a6Icie6cIp lPJQ3PLysNmApEb37apgHNKdsQ8TSkCDROX2JZFRz5PhRX/nyetzdCCOcdP2PmHcWOtj tbAQZ0Rn9q0uU9kUROu7sgU/dC/4tvFo77qdpe53W2c17KHwiSbOCYE/D7+1e4m7imgl llog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id x190-20020a6386c7000000b0055b43079642si7357705pgd.120.2023.09.13.11.30.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:30:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id E08BD82C516E; Wed, 13 Sep 2023 07:08:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241297AbjIMOI6 (ORCPT + 36 others); Wed, 13 Sep 2023 10:08:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241234AbjIMOIz (ORCPT ); Wed, 13 Sep 2023 10:08:55 -0400 Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 710A41BC7 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by andre.telenet-ops.be with bizsmtp id lS8n2A0023fvA4V01S8nWk; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crl-Hy; Wed, 13 Sep 2023 16:08:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV4N-TL; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 13/52] m68k: mm: Add and use "fault.h" Date: Wed, 13 Sep 2023 16:08:03 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:08:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948156857816832 X-GMAIL-MSGID: 1776948156857816832 When building with W=1: arch/m68k/mm/fault.c:22:5: warning: no previous prototype for ‘send_fault_sig’ [-Wmissing-prototypes] 22 | int send_fault_sig(struct pt_regs *regs) | ^~~~~~~~~~~~~~ arch/m68k/mm/fault.c:68:5: warning: no previous prototype for ‘do_page_fault’ [-Wmissing-prototypes] 68 | int do_page_fault(struct pt_regs *regs, unsigned long address, | ^~~~~~~~~~~~~ Fix this by introducing a new header file "fault.h" for holding the prototypes of functions implemented in arch/m68k/mm/fault.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/sys_m68k.c | 3 +-- arch/m68k/kernel/traps.c | 5 +---- arch/m68k/mm/fault.c | 2 ++ arch/m68k/mm/fault.h | 7 +++++++ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 arch/m68k/mm/fault.h diff --git a/arch/m68k/kernel/sys_m68k.c b/arch/m68k/kernel/sys_m68k.c index 14055d676161d725..1af5e60824676bf3 100644 --- a/arch/m68k/kernel/sys_m68k.c +++ b/arch/m68k/kernel/sys_m68k.c @@ -35,8 +35,7 @@ #include -asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address, - unsigned long error_code); +#include "../mm/fault.h" asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index d408334712f7118b..129c89349e1a40aa 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -42,6 +42,7 @@ #include #include "traps.h" +#include "../mm/fault.h" static const char *vec_names[] = { [VEC_RESETSP] = "RESET SP", @@ -126,10 +127,6 @@ static const char *space_names[] = { }; void die_if_kernel(char *,struct pt_regs *,int); -asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address, - unsigned long error_code); -int send_fault_sig(struct pt_regs *regs); - asmlinkage void trap_c(struct frame *fp); #if defined (CONFIG_M68060) diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index c290c5c0cfb93a81..fa3c5f38d9894c08 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c @@ -17,6 +17,8 @@ #include #include +#include "fault.h" + extern void die_if_kernel(char *, struct pt_regs *, long); int send_fault_sig(struct pt_regs *regs) diff --git a/arch/m68k/mm/fault.h b/arch/m68k/mm/fault.h new file mode 100644 index 0000000000000000..dab14ef7d4a171d5 --- /dev/null +++ b/arch/m68k/mm/fault.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +struct pt_regs; + +int do_page_fault(struct pt_regs *regs, unsigned long address, + unsigned long error_code); +int send_fault_sig(struct pt_regs *regs); From patchwork Wed Sep 13 14:08:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138837 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120773vqx; Wed, 13 Sep 2023 07:20:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEZY+JhDzEVZq/Oh1Sc9w5AfaeLnjYjFARukDD347RcIAE/VIcwYVygZ7A9SemN7fQxPIR5 X-Received: by 2002:a05:6a20:1450:b0:153:588c:f197 with SMTP id a16-20020a056a20145000b00153588cf197mr2759386pzi.35.1694614831720; Wed, 13 Sep 2023 07:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614831; cv=none; d=google.com; s=arc-20160816; b=JWiglrig9RHt9gftu4pMBtjvFltIC+QExs2BvB3mUeo+wVR/G4Ca4nFUT8P/rVAbSr fgW6COa7OCluMcrfH/VC4UytCQyHmJQQjtOat4UtVFaPp+CUj1sChAiQFDXvV9XvRsyY U5qopMheLoBf/c5qDtrE8d/rkXsqULyFfaZX4/23o5Vzv6BJx+oDV5KpMr8YJNPTeIsY hn0xG2XVtJOgzMLaY1ZeykXWVjzZCFABkK/eumJY/2DayWGvv7QZwH7wMMHT5XLJiG9C Hj6N9cngIB+1UJao2N+AW5PaYLnt6sEEaLhvIt+66G6Qc9q2poCB1PS1+F8J0fP/MIxb KK9w== 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; bh=eIcE+1VJ7k+MlMrdrYkzbuqkVVKhpNDnvQi19o0oQ1A=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=lgGHUDnLWc5HjWesExoQ+keuCThBcYF/IHZDgqWLJ+lrfH0SNNYA/ltAEEdOTxAvHR +G0eTG2APjTN/uuKv2sAEG8wtOWJ5I5GoarLQsmJZOmr+NtNTNglJAQY8GYFzfXsP2pA rAEwoDYarmSzyoVWUVRoi6hOPgYHXfrx5NC5xcdHNcDdHGukRYDeb8Tl+9i6DrDau7ez O/owh5kjoLaKL0bi6+aRRAxxa5dEg+4CzIWHQ9D1DyNjdZUZNKjkaxqDFn2c1roD9MSy +/XcrFLnzXAY+M2fsDyEct6iy42uKWRwqMNkV36Pp5QCnaVIdNeNeUmfO0VWRPqDqjQC 3GZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id bk13-20020a056a02028d00b00566022a3894si10331823pgb.415.2023.09.13.07.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3B97A80425A4; Wed, 13 Sep 2023 07:09:45 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241273AbjIMOJ2 (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241274AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 960851BE1 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by baptiste.telenet-ops.be with bizsmtp id lS8n2A0023fvA4V01S8nqC; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crp-If; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV4S-U5; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 14/52] m68k: emu: Remove unused vsnprintf() return value in nfprint() Date: Wed, 13 Sep 2023 16:08:04 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:45 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932441971330719 X-GMAIL-MSGID: 1776932441971330719 When building with W=1: arch/m68k/emu/natfeat.c: In function ‘nfprint’: arch/m68k/emu/natfeat.c:59:13: warning: variable ‘n’ set but not used [-Wunused-but-set-variable] 59 | int n; | ^ As the return value of vsnprintf() is unused, and serves no practical purpose here, fix this by removing the variable. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/emu/natfeat.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c index b19dc00026d9953b..344637539438d682 100644 --- a/arch/m68k/emu/natfeat.c +++ b/arch/m68k/emu/natfeat.c @@ -56,10 +56,9 @@ void nfprint(const char *fmt, ...) { static char buf[256]; va_list ap; - int n; va_start(ap, fmt); - n = vsnprintf(buf, 256, fmt, ap); + vsnprintf(buf, 256, fmt, ap); nf_call(nf_get_id("NF_STDERR"), virt_to_phys(buf)); va_end(ap); } From patchwork Wed Sep 13 14:08:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139190 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp30632vqi; Wed, 13 Sep 2023 17:53:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGs/Wuxi932/OtWZPfCNH2VpTAU/kZf6SSOhelgGsbnD1uPTugSDdolc/HjYu+i/WuA6YLZ X-Received: by 2002:a05:6a21:7748:b0:157:be16:b6bc with SMTP id bc8-20020a056a21774800b00157be16b6bcmr4165433pzc.59.1694652791057; Wed, 13 Sep 2023 17:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694652791; cv=none; d=google.com; s=arc-20160816; b=x1AJP5SoCVqOKNC/Y+tekCJo82Yx6JGnHYVuvIYSHbRWhbZOg5j2v+L7iTjN6hknUh KIDxVMtdFSxUCgV8ZHD5HxCDuLV22TX2NLTvsA1LFmdcDlUiNgmbtwH/Q7xNQNVRWnhe LkoGxKmjekp35LHqISMTRMFhfIzKnKXPXLkbA/Q+m3qI3AFajZu7EPkuVgbqIf0SsQl1 lWcfrGbBhc7YDyWQxo5IAqPZ0nijk/+Pf2ATAICRMFV1LCmMLHF/bvbMtboFcnq8aM8u eK1WPcIcLKGvBSrXv+LOVUP6JTcXi4HZ3wDVkdWQ+1hx28sP4rIxaiQ6F95PM0bPeEq5 NbpQ== 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; bh=fEXxNiCV8ou+fb7c/hPHeFyY4b+sJL5SyVwSumRfv54=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=PxcvCFLkVH4vmSPdawuUm6Kam4wnyGVBEdu3LaiOsWHB0nmImPPil/+scFLSyLbBkp DCsl1pPY7rUCPVYVpoCMblBk3GtEKMFLZSJhbVvCZYM+exhMV38o9IL3IiPndL1l6xr/ CTtoTfz5v+EmJUT/SKApPixepgFLyKb74MucaMWHKuZUY0YyY0s/3VX16XfW3IOqzXug T7/N63KaxKxTX12AbUsb46CAR0QphQ8IU0QaNDw9++5avdbGP0nYbLa88qnl26OpWUq7 55voaU3cz2eh72G8kGDh4qydj954j5bOAjFMUec1BNrIgRWdCbsp62b9MgBuRSN4PHFN JDnA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id b18-20020a17090ae39200b00273ede74018si463130pjz.187.2023.09.13.17.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 17:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 936738030B89; Wed, 13 Sep 2023 07:11:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241312AbjIMOKz (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241499AbjIMOKC (ORCPT ); Wed, 13 Sep 2023 10:10:02 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B80C2211C for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from ramsan.of.borg ([84.195.187.55]) by michel.telenet-ops.be with bizsmtp id lS8p2A00R1C8whw06S8qJX; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cru-JR; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV4Y-Ur; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 15/52] m68k: emu: Mark version[] __maybe_unused Date: Wed, 13 Sep 2023 16:08:05 +0200 Message-Id: <051731639b4c8e296ec4017595051885cc551c23.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776972245181428998 X-GMAIL-MSGID: 1776972245181428998 When building with W=1: arch/m68k/emu/nfeth.c:42:19: warning: ‘version’ defined but not used [-Wunused-const-variable=] 42 | static const char version[] = | ^~~~~~~ Fix this while obeying the wishes of the original copyright holders by marking version[] with __maybe_unused. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by, - Drop prefix from compiler output. --- arch/m68k/emu/nfeth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/emu/nfeth.c b/arch/m68k/emu/nfeth.c index 1a5d1e8eb4c80839..26e68813f35144f8 100644 --- a/arch/m68k/emu/nfeth.c +++ b/arch/m68k/emu/nfeth.c @@ -39,7 +39,7 @@ enum { #define MAX_UNIT 8 /* These identify the driver base version and may not be removed. */ -static const char version[] = +static const char version[] __maybe_unused = KERN_INFO KBUILD_MODNAME ".c:v" DRV_VERSION " " DRV_RELDATE " S.Opichal, M.Jurik, P.Stehlik\n" KERN_INFO " http://aranym.org/\n"; From patchwork Wed Sep 13 14:08:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138833 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120654vqx; Wed, 13 Sep 2023 07:20:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3z9aF5+dAFcTY1Pet4+lsoWxoPW62NEfgS5cgTsmf1cgpGfKumwoWEVtNplRKcKZ6QJAW X-Received: by 2002:a17:90a:ca15:b0:25d:eca9:1621 with SMTP id x21-20020a17090aca1500b0025deca91621mr2179612pjt.6.1694614822372; Wed, 13 Sep 2023 07:20:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614822; cv=none; d=google.com; s=arc-20160816; b=all2t1jwV3xcLpreJfzzd+SaqdbnAuAQESft7GOBFT1t6c9UQOWmoT0bFoLFhMvjqR A3HW82Ef5mSXqTnQfbXj8S7U1X8zVa9cmpSsPgjCyXLetap10+k8KLXbGx9e+zZvGBa6 mHksiNc4G0UKop9RQYTfIA+LUpAwxoEAGr13c71Og+nDMB9nsv79V2KXkwcZwv5ReYtm 7aYzZIpHaLJdy0uMc4SUqRZSD/E3mZdbv4cQtszXXdq3I73UiyioP+NDZj5VuceAu3le ylvovF7S73KYTcOVnPqBIEWd35bcUgKr5sppPqvT2n54EKaP6aPZjxsnrJ/f1QKI78rr MR4w== 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; bh=9PJMxrpBvh3w1DimG9rh1UueGLdE4ByVNznPkvKjx10=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=SMlkjlbJsiEtHh/Zwm/tmHiC+/e3tno2E9evp40bj8PU44zkqk4FQJtqnt1WABg+yz gHzWWBOPUBue3y7TV1ht0haaZOSyznV2+RQ2zxF6RnACdDiWhtaoCQQooaa86XUnVVjR 2mMlpR7IgSRbG5671B84J4f5RC3vQl1n/pwfxEChiuEY0wR+hGdbIgJ66ZtTXUPo5QxC tU+/RmUvQLdL3v5KMezFPcmh6M7t/fkYyFOgBFnWqRHcjmezpVrEnjCnibKa8pzl81Nm ++7WEGzNjuh6UZS78K5+cSdvUGn/bV+jj/tgJtcY4U4TmFT5Pc4kfMdhQMBwyOzlcy3B jz5Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id m15-20020a17090b068f00b002740f52e526si417985pjz.139.2023.09.13.07.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id C3864804ACC2; Wed, 13 Sep 2023 07:09:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241367AbjIMOJU (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241263AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7CB431BDD for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by baptiste.telenet-ops.be with bizsmtp id lS8n2A0043fvA4V01S8nqD; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003crw-KA; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXu-00FV4d-Vg; Wed, 13 Sep 2023 16:08:46 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 16/52] m68k: amiga: pcmcia: Replace set but not used variable by READ_ONCE() Date: Wed, 13 Sep 2023 16:08:06 +0200 Message-Id: <1436fa6b329c2212aaf020055afbb97e64b6f039.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932431916618700 X-GMAIL-MSGID: 1776932431916618700 When building with W=1: arch/m68k/amiga/pcmcia.c: In function ‘pcmcia_reset’: arch/m68k/amiga/pcmcia.c:29:23: warning: variable ‘b’ set but not used [-Wunused-but-set-variable] 29 | unsigned char b; | ^ Fix this by using READ_ONCE(), and removing the variable. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/amiga/pcmcia.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/m68k/amiga/pcmcia.c b/arch/m68k/amiga/pcmcia.c index 7106f0c3639bc105..63cce6b590df4dcb 100644 --- a/arch/m68k/amiga/pcmcia.c +++ b/arch/m68k/amiga/pcmcia.c @@ -26,11 +26,10 @@ static unsigned char cfg_byte = GAYLE_CFG_0V|GAYLE_CFG_150NS; void pcmcia_reset(void) { unsigned long reset_start_time = jiffies; - unsigned char b; gayle_reset = 0x00; while (time_before(jiffies, reset_start_time + 1*HZ/100)); - b = gayle_reset; + READ_ONCE(gayle_reset); } EXPORT_SYMBOL(pcmcia_reset); From patchwork Wed Sep 13 14:08:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139189 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp30635vqi; Wed, 13 Sep 2023 17:53:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGrwNEk1yVdVMkbVnz2M2OXoz8RIYGQxxLWpdNYV4vR/Vsg92boEaLrmbrUNU7Q86OVshG4 X-Received: by 2002:a05:6102:152:b0:44e:9afe:c5b2 with SMTP id a18-20020a056102015200b0044e9afec5b2mr4082205vsr.27.1694652791436; Wed, 13 Sep 2023 17:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694652791; cv=none; d=google.com; s=arc-20160816; b=hcnXdRq65t8hvtppbV0tkRU5l8PehDsbhg5d4e1bufigwE2WvQTL6T2uJg4pEy4LG7 Tee+985kev6aFc5C/9aUJwX3+ZWQ5J5wg3YpF2j4k7ykiUI+vdYIi3JK+C6wSYHvE3ns 78OOkyZ+naPZwBcJ218XMgv/+ZL9Rokp0/jw7MzfjxVtOj3GlH1vyL08Bm0GSDIkMWg2 AOKWTC3GSF0D6+zHO9G6E/duU5D2wlzJvL/6R9WxwdI5HWc5UTb4/+F8UMvBJfi8dikJ MiqX57iJVaCCOsRdZ8AmnTH6FA4Ae3EaCTd6A13r/DYxwF/mJL9unrSItCqobHGB5YJf T2fg== 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; bh=bL881H0lOn1n072B8y/4weXc2n/LZBgihTxVtIPYegg=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=b3ZJmqM0IroZM9oDfhgmr7ZkRAsutGPjNkJllv564LSXU3jc0Bp4sdyr8NvIWE29JU FqUwHRgKFbPh8hNnKTLpM1CaeK4kkwWmLVVJLA2p22YCvglwkebfOicSR+4EqaAlODmR bZNF8YtYu9ggiliufLIqeRe1QoqDjeOYcgq11TDamPJ7QNn2Eo+jJnAQXP2THN1do/vD 1dkY5aVd+f24lnIQZwDxjP91UhSU2CBQ83D1lkoA9VLs3ve7PP3FdZtfJYducjzwx/fp a7niPlnicYDf3ercBWwXOM2f8H9lRKi3onnfG4kaVqUI04IK/qtTTp+rbge4RXgYvHsI 6zLg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id r135-20020a632b8d000000b00553867efc1bsi321948pgr.636.2023.09.13.17.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 17:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id A70618030B8A; Wed, 13 Sep 2023 07:11:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241712AbjIMOK5 (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241502AbjIMOKD (ORCPT ); Wed, 13 Sep 2023 10:10:03 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BB3762121 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by michel.telenet-ops.be with bizsmtp id lS8p2A00T3fvA4V06S8qJW; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cs1-Kx; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV4i-0C; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 17/52] m68k: amiga: Add and use "amiga.h" Date: Wed, 13 Sep 2023 16:08:07 +0200 Message-Id: <7e9395e1de1c9a34d16ea40a522057f05bbee400.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776972245382243647 X-GMAIL-MSGID: 1776972245382243647 When building with W=1: arch/m68k/amiga/amisound.c:48:13: warning: no previous prototype for ‘amiga_init_sound’ [-Wmissing-prototypes] 48 | void __init amiga_init_sound(void) | ^~~~~~~~~~~~~~~~ arch/m68k/amiga/amisound.c:71:6: warning: no previous prototype for ‘amiga_mksound’ [-Wmissing-prototypes] 71 | void amiga_mksound( unsigned int hz, unsigned int ticks ) | ^~~~~~~~~~~~~ Fix this by introducing a new header file "amiga.h" for holding the prototypes of functions implemented in arch/m68k/amiga/. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/amiga/amiga.h | 5 +++++ arch/m68k/amiga/amisound.c | 2 ++ arch/m68k/amiga/config.c | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 arch/m68k/amiga/amiga.h diff --git a/arch/m68k/amiga/amiga.h b/arch/m68k/amiga/amiga.h new file mode 100644 index 0000000000000000..00392781442cb91a --- /dev/null +++ b/arch/m68k/amiga/amiga.h @@ -0,0 +1,5 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* amisound.c */ +void amiga_init_sound(void); +void amiga_mksound(unsigned int hz, unsigned int ticks); diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c index 442bdeee6bd7920c..714fe8ec6afa3364 100644 --- a/arch/m68k/amiga/amisound.c +++ b/arch/m68k/amiga/amisound.c @@ -16,6 +16,8 @@ #include +#include "amiga.h" + static unsigned short *snd_data; static const signed char sine_data[] = { 0, 39, 75, 103, 121, 127, 121, 103, 75, 39, diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 3137b45750dfcea7..7791673e547bf795 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -39,6 +39,8 @@ #include #include +#include "amiga.h" + static unsigned long amiga_model; unsigned long amiga_eclock; @@ -96,9 +98,7 @@ static char amiga_model_name[13] = "Amiga "; static void amiga_sched_init(void); static void amiga_get_model(char *model); static void amiga_get_hardware_list(struct seq_file *m); -extern void amiga_mksound(unsigned int count, unsigned int ticks); static void amiga_reset(void); -extern void amiga_init_sound(void); static void amiga_mem_console_write(struct console *co, const char *b, unsigned int count); #ifdef CONFIG_HEARTBEAT From patchwork Wed Sep 13 14:08:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138852 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1123755vqx; Wed, 13 Sep 2023 07:25:09 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfqylUBoNXYQSrDLVb+i+zQ2Ubz3PLYGHhDSBySEwi4CJtviKSdabJDuwGbpGzPbD6zytU X-Received: by 2002:a05:6a00:852:b0:68a:5197:619f with SMTP id q18-20020a056a00085200b0068a5197619fmr3331742pfk.31.1694615108785; Wed, 13 Sep 2023 07:25:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615108; cv=none; d=google.com; s=arc-20160816; b=vWpyDC3Lj9hEx8pawgI+tAuQpJxqrilwcGLh5ql0tmVYdhjFDqxp+0YFM+Xp5XkmKi D/hI2doHvlKa9CPgPjNrzy3OeX4itMGx/f6Eo/A+WYrfSt8/EebjsX+7YJ+P5hIduqGV q6wTqYNqGwTeSCSAhgaDpvKwUX3yqM1po0RgDI0E62TDHOSD9XbRw8INzpeT4siV42hr qvFxKZQWg89Xy+hRDclCel+MKkEdP5IXNBCGBctr6fa8ZdqaOw1ZaxanVEF/ew91X0Ax NKghjaCGcVmQsQJuVGWgIyEw9XrJnM/SXv/2N+hq9CaSuiBZti0Yu0dkbS98izaEHD0S LOBA== 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; bh=BKtSyfQBzGgSigPzBTocCrNFgZuxwlhNHESITWqCDOA=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=ZzsBS1sulkzKGSEKssERfZi3yAuydeufR8tZfudnNR2U0HauSvdabBbqdwnnP1oEJC QYnm2rZTLMPcFj0DfgpZzCjCdJ2Ss13RL4vzCQDoeG/Ay2sLD3icx3uxh/lyovho5y5m mk1Gknt2n0a4X50jILJ9aMF9QaEV5c9b0Gyb6b4e7KUFUHjoQCSmzWdmbE3WkGwoSOjS rS0iVSFNNnyaGIBduE5PZ+ZE81MFx+fQVGeEEGhKxBmBxfKDUC77soET6h6uukTxzY3b bKPqmajX3QAPdaTy9OhszHg9FxLS+nAfm5db3iRcy+33q888fg9Z3upf6YhYOlMKnCD0 gVZQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id dc11-20020a056a0035cb00b0068e241eef99si10005226pfb.316.2023.09.13.07.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:25:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 05F318040387; Wed, 13 Sep 2023 07:11:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241511AbjIMOKy (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241490AbjIMOKC (ORCPT ); Wed, 13 Sep 2023 10:10:02 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FF122119 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by michel.telenet-ops.be with bizsmtp id lS8p2A00U3fvA4V06S8qJa; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cs5-Lm; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV4n-0w; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 18/52] m68k: atari: Document data parameter of stdma_try_lock() Date: Wed, 13 Sep 2023 16:08:08 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:18 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932732149997058 X-GMAIL-MSGID: 1776932732149997058 When building with W=1: arch/m68k/atari/stdma.c:69: warning: Function parameter or member 'data' not described in 'stdma_try_lock' Fix this by documenting the data parameter. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/atari/stdma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c index ce6818eff75efcdf..155fefff19b0e19d 100644 --- a/arch/m68k/atari/stdma.c +++ b/arch/m68k/atari/stdma.c @@ -61,6 +61,7 @@ static irqreturn_t stdma_int (int irq, void *dummy); /** * stdma_try_lock - attempt to acquire ST DMA interrupt "lock" * @handler: interrupt handler to use after acquisition + * @data: cookie passed to the interrupt handler function * * Returns !0 if lock was acquired; otherwise 0. */ From patchwork Wed Sep 13 14:08:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138810 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1113213vqx; Wed, 13 Sep 2023 07:10:15 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHY9v9Q9L0WAA0iEJICH869/XbqSrwVEm1097lZQtqeL4zy3egScGvqHjxEK5/8zgcc/M7D X-Received: by 2002:a05:6a20:2445:b0:159:a851:7e9 with SMTP id t5-20020a056a20244500b00159a85107e9mr783797pzc.12.1694614214650; Wed, 13 Sep 2023 07:10:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614214; cv=none; d=google.com; s=arc-20160816; b=rejDcLCE0vWtLvJeNSXJqkN4PZqF6MjHExUrq2tIGbYGGe0QBQOecnZpvhygxscDHm dw1GPmENxNIThX0fIg+pnZOJsuKHXcl0Dp3KpkAPb5a26V+GZeBpZB/bQn4A9LOeCMKf L3kkbkqlX8zlHzKqxZkh7TUldJrZ8hMOXrXRzisZwJs3zC+Gba+7CWYXK9TuJ5mfMEyZ u30kqIwRZXWkRKGm3+rZWTJYOUR6VL9IyIkgiqATMH38X8brWb0Df/YQSAtZ1g7KIywl LVhtBHyrGNLSpT7r3a1rK2/H/RAuLHLEZO3xCelhpBSSlcoyIyxkmGNCbXb0fjbh1SI+ IdSA== 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; bh=voubsPcO/XLZKm6qXcIWbi6rsTifHgcubR2NoJYN2ic=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=xDT5mZcUe4kIH1I+w6wKhSlfokd2gq1K7rx4i2T2tQDf8tSRPiLFNCib/+ygVL8QS1 Cj781Qvhwj3vjfy6qt0mXcc3+CYLDvoLeL/2pnE675Z/l/CSRcKrs5PwHo1H8yoszqTz grHsSJ3pXwyHaAESK/HFvxarAhZw784ihOFHVsrLFqcKIgH1MZVZW8h4DE6vPu0J5E25 TigoQweNyTWqR9HcU+eKJjDd2okrzEIdxVN8AEEJ4vNVJlsMWovlxZIssAIglSLl7T25 UigHpxMtZQ1iHH7yMEfPzPYaNsZSWpAmiDksJRQhAEmexfH68cIkdkzZP2Lo88HLN4Js BiBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id a28-20020a056a001d1c00b0068e380c3654si2402079pfx.395.2023.09.13.07.10.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:10:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 4C93280BB1EE; Wed, 13 Sep 2023 07:10:10 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241426AbjIMOJj (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241284AbjIMOI5 (ORCPT ); Wed, 13 Sep 2023 10:08:57 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1139D1BC3 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8n2A0033fvA4V01S8nmA; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003cs9-Mb; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV4s-1k; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 19/52] m68k: atari: Make ikbd_reset() static Date: Wed, 13 Sep 2023 16:08:09 +0200 Message-Id: <6babf691fff55f913808ad845e66f60ab00063b2.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:10 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931794654665196 X-GMAIL-MSGID: 1776931794654665196 When building with W=1: arch/m68k/atari/atakeyb.c:335:6: warning: no previous prototype for ‘ikbd_reset’ [-Wmissing-prototypes] 335 | void ikbd_reset(void) | ^~~~~~~~~~ Fix this by making ikbd_reset() static. There was never a user outside arch/m68k/atari/atakey.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/atari/atakeyb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index 5e0e682f9c61a60e..49a9a459bdf4ccbd 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c @@ -332,7 +332,7 @@ void ikbd_write(const char *str, int len) } /* Reset (without touching the clock) */ -void ikbd_reset(void) +static void ikbd_reset(void) { static const char cmd[2] = { 0x80, 0x01 }; From patchwork Wed Sep 13 14:08:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138821 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1118706vqx; Wed, 13 Sep 2023 07:17:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF5nejpr/anzZsHPu4M+aO1n6UHH+2s8t0eqquHhNDGFVVOB7XYmJYN6EPtusVRfuLoMWRv X-Received: by 2002:a05:6a00:4686:b0:690:15c7:60c0 with SMTP id de6-20020a056a00468600b0069015c760c0mr1055269pfb.19.1694614656046; Wed, 13 Sep 2023 07:17:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614656; cv=none; d=google.com; s=arc-20160816; b=oqdKC/Wq2f0D0XtPFY/pyMvjMBd1ClmR0D2omI/5oUdRzGgJCa3InUubwqQq8Td9yG /x7/7y628xLlc9T+rTFUZ6zMKA/inFf82GaLIBILFePm21stL75U6ZF9YfsXvYSuhEWH xMxLGK1fTrq5AO3WbDVqoTQOHIpRELrrGZVnsQ7cJuoLkvzL7BdtI/1unUp7XVBGH6ej 5TUlRNVyoB5b2Z23QWVfxv/Oi0NcOqwRA2HU36+gpSiSVbHgj7Wi7fvockh96bg9UBQz lDrbuWUOE9CyvpfuIuIoayQh3f368Kv6Ksdm/RVxpHh4tptrn+P/OSEZ5E8YxmnKB4Q0 sO5w== 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; bh=y4QfSzINv5P6lMiL8JHkNHhvU8s8wzzxdKYF74bL7gk=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=Hz0P4gudYcwBYHmdE+vAtJ65aq3vmNEZwZ4babwYF36SlvPLmH4LZSalDZJ9+6umEz K947s2BJoMZbLeK+k7t9xZHN6oHBnJ2eZWcgc9UVn7Mey/F9LXgmwOghx7EyII1ouvyp PXvqHHxqS8d3mUcFvVyEAZ5KA1rfd8Dx+NsXhadb9EFRyEpl5J8inLZV0+fITXDxjHGJ DT9a849UVr8nzbPn2LpCd0rTbmRmOWhQ5NTb7/atViyZl8+7+ippi+CHyxCdbCcSWaAp d+8gdlGiogdSHr+q2teJKZ8hG3Vufnk0zhpWrNpKeMt6l+ZWLEC15wxayfYev8Z9AgfM 1BHw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id ea16-20020a056a004c1000b0068a54e524d9si10106834pfb.150.2023.09.13.07.17.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:17:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 1DD1C80B908A; Wed, 13 Sep 2023 07:11:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241656AbjIMOKj (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53060 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241320AbjIMOJl (ORCPT ); Wed, 13 Sep 2023 10:09:41 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34B141FE6 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by michel.telenet-ops.be with bizsmtp id lS8p2A00V3fvA4V06S8qJY; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csE-NQ; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV4w-2W; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 20/52] m68k: atari: Make atari_platform_init() static Date: Wed, 13 Sep 2023 16:08:10 +0200 Message-Id: <417b46ec1945212c0b1fcc8b0f4074bae9a8b0b4.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:20 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932257635198262 X-GMAIL-MSGID: 1776932257635198262 When building with W=1: arch/m68k/atari/config.c:883:12: warning: no previous prototype for ‘atari_platform_init’ [-Wmissing-prototypes] 883 | int __init atari_platform_init(void) | ^~~~~~~~~~~~~~~~~~~ Fix this by making atari_platform_init() static. There was never a user outside arch/m68k/atari/config.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/atari/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index 38a7c05781059840..b4fe4273ad912ebe 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -880,7 +880,7 @@ static const struct resource atari_falconide_rsrc[] __initconst = { DEFINE_RES_MEM(FALCON_IDE_BASE + 0x38, 2), }; -int __init atari_platform_init(void) +static int __init atari_platform_init(void) { struct platform_device *pdev; int rv = 0; From patchwork Wed Sep 13 14:08:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1121033vqx; Wed, 13 Sep 2023 07:20:51 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFpz38bqfJmBVH1sESFbh9ZrkZ0sYQnFCipunARq++PZ9GH5QdS8UzhAYF1iCZcaH0OmY66 X-Received: by 2002:a05:6e02:154e:b0:349:849d:bdf7 with SMTP id j14-20020a056e02154e00b00349849dbdf7mr3289912ilu.17.1694614851088; Wed, 13 Sep 2023 07:20:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614851; cv=none; d=google.com; s=arc-20160816; b=Z2KWorr/fFPxeAlhSp3xYad386cAcsQa6dl7Wu8QMTRtfkdjQjfC4RGLKz8COm4xUn PXh+0fmS84QcMojbmcCaD0zeWJtH9QF49MdRJcctOGIBxliJmoDEVA5v4rKawdD2uUxX Q8zxbgERxhbn7r4PxDiPRypB9H3mKThdSpSleIbchWCYBdyI1AWGDOK/PEGGtRttp/FN T1zjuEzBztxhKcQhjhUEPE+A04zzfQGkiKHoT+Fe6sp65liqxTGSxTVx/EqWWpGZGwJE 4HQxkkYur1lQOcuhVwuOQuMCg5f6SvYOyeedtdmnQuZHPSiMAkLwcMtgIcelvhbZurwW Pw8A== 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; bh=UJyU3wMWPtg7DvIgndWBmuCr0VZvMY58O3uNGo6H7FU=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=rPfgL2KF3uFtEApY4W+oQCU4EIBbaBINBiH6PvYAt0xOaoDO4DT0pQDJG1q2qI6/35 I/yuV0JHigrm4PypqmzugssYwehWzLfUyVmzm7fgkGQAldKGWx1qWOFyZKX7pP3G7NHX 7S/qAf/dCGmWzOdMjp1akRj4EjxKhZDVfw/MyEGTLJGYiDKMIRzjjSGJmoD2+wRlpEZy dpZli7C7Oj586PYTVcOWwWSNJkpttzHqDCurOF3nZYxbjHo5iwK/oYkGiX6SQKj86nHS yxznZcfHCHVRcgFK32FpoSksABfqY8yf4lCyYgd7rvXr1fo8OFktb8nP2fN1xB2I0C8y TO+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id s70-20020a632c49000000b00573fc12065csi2074483pgs.242.2023.09.13.07.20.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:51 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id CFB4780C03B2; Wed, 13 Sep 2023 07:10:27 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241572AbjIMOKU (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52912 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241380AbjIMOJX (ORCPT ); Wed, 13 Sep 2023 10:09:23 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4506C1BCF for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8n2A0043fvA4V01S8nmB; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csG-O4; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV52-3I; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 21/52] m68k: atari: Make atari_stram_map_pages() static Date: Wed, 13 Sep 2023 16:08:11 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932461729553429 X-GMAIL-MSGID: 1776932461729553429 When building with W=1: arch/m68k/atari/stram.c:118:12: warning: no previous prototype for ‘atari_stram_map_pages’ [-Wmissing-prototypes] 118 | int __init atari_stram_map_pages(void) | ^~~~~~~~~~~~~~~~~~~~~ Fix this by making atari_stram_map_pages() static. There was never a user outside arch/m68k/atari/stram.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/atari/stram.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index ce79b322a99cbda4..922e53bcb853289d 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c @@ -115,7 +115,7 @@ void __init atari_stram_reserve_pages(void *start_mem) * This function is called as arch initcall to reserve the pages needed for * ST-RAM management, if the kernel does not reside in ST-RAM. */ -int __init atari_stram_map_pages(void) +static int __init atari_stram_map_pages(void) { if (!kernel_in_stram) { /* From patchwork Wed Sep 13 14:08:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139015 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6533vqb; Wed, 13 Sep 2023 11:34:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEUKJTKb31es0xDmP9AUZ74RyfHqu+ds/Ve3Hcjk76yY9R3S7iuetjSr70cc7DtWBa75WEV X-Received: by 2002:a05:6a00:1a88:b0:68f:d6db:5d66 with SMTP id e8-20020a056a001a8800b0068fd6db5d66mr3429775pfv.16.1694630078921; Wed, 13 Sep 2023 11:34:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630078; cv=none; d=google.com; s=arc-20160816; b=VtcrttLyan2FglUJsk0I5ypB7YJI/NYP568exuWe/DIymKRKkaPr2vziJ/+mukwXgv IfSxScgC4efjF/Qh18Ad76gBZy7wl4T6EOHWeXda8Gu9ufzHhvwJlwrAyG9MNfnW2wwJ 4H7+vNuNUEPwkMfzSIbGLWl5HfwU5cdHw3398rHf6AN1lrhvGXY6v/EX1ZctYaImNHwV 2goN9N8SC9r53BmizaUNhQVFwZvkoGfQu0RbtGdPxgLFIubOkP1ChqSiaZ8EOtnUJAL/ qFUUDodND75/yYdIv9OksXI1tUMpvZstrADJIX83mOn5U4HaSWhpAPqbnCsLMy4+XGOZ Volw== 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; bh=n3MWqzGNC1DpP4OPSuEuNibli1fPGethWP77XcMDhI0=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=nJPmhWfIXwL3rt1o2cEUU0uhMgVicGpNBGl31+ZAU1PHu1dEfzdmsAkttgklFfFggI eaEYj4w3TDq6tPGZjjkeQXpgFxKJA6hSsIRcZVBdT+USHQMUT/csJX82q6E4LZM4+WAf lpCtHcheoQgN0dLfz5uVwyZ1huZ79jS2Bx0XzCcl2VqKoBj910femv/NJFV8Kf3LWeKl kdrPLKa8iEQZMrH7UK3fmvXnbbT0vO1dYwZDAAeJb0bnavDfKsr0qcapCFYzZTSpUlIj mtJjqr68eADPczmUfPhMgBj77k3/Wz5YKwOpqWUXHVLWJZdDIxMW6tpNZ1w87LJe2gV9 uR0Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id n28-20020a638f1c000000b005774c90073asi7965521pgd.320.2023.09.13.11.34.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:34:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id C4251842AD3D; Wed, 13 Sep 2023 07:10:24 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241439AbjIMOKO (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241372AbjIMOJW (ORCPT ); Wed, 13 Sep 2023 10:09:22 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43D971BD2 for ; Wed, 13 Sep 2023 07:08:52 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8n2A0073fvA4V01S8nmD; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csL-PL; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV57-44; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 22/52] m68k: atari: Add and use "atari.h" Date: Wed, 13 Sep 2023 16:08:12 +0200 Message-Id: <336e4a478ccbfd7e3e91cdbd27636947587a23a6.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:24 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948429407664264 X-GMAIL-MSGID: 1776948429407664264 When building with W=1: arch/m68k/atari/time.c:59:1: warning: no previous prototype for ‘atari_sched_init’ [-Wmissing-prototypes] 59 | atari_sched_init(void) | ^~~~~~~~~~~~~~~~ arch/m68k/atari/time.c:140:5: warning: no previous prototype for ‘atari_mste_hwclk’ [-Wmissing-prototypes] 140 | int atari_mste_hwclk( int op, struct rtc_time *t ) | ^~~~~~~~~~~~~~~~ arch/m68k/atari/time.c:199:5: warning: no previous prototype for ‘atari_tt_hwclk’ [-Wmissing-prototypes] 199 | int atari_tt_hwclk( int op, struct rtc_time *t ) | ^~~~~~~~~~~~~~ arch/m68k/atari/ataints.c:267:13: warning: no previous prototype for ‘atari_init_IRQ’ [-Wmissing-prototypes] 267 | void __init atari_init_IRQ(void) | ^~~~~~~~~~~~~~ arch/m68k/atari/atasound.c:36:6: warning: no previous prototype for ‘atari_microwire_cmd’ [-Wmissing-prototypes] 36 | void atari_microwire_cmd (int cmd) | ^~~~~~~~~~~~~~~~~~~ arch/m68k/atari/atasound.c:53:6: warning: no previous prototype for ‘atari_mksound’ [-Wmissing-prototypes] 53 | void atari_mksound (unsigned int hz, unsigned int ticks) | ^~~~~~~~~~~~~ Fix this by introducing a new header file "atari.h" for holding the prototypes of functions implemented in arch/m68k/atari/. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/atari/ataints.c | 3 +-- arch/m68k/atari/atari.h | 15 +++++++++++++++ arch/m68k/atari/atasound.c | 1 + arch/m68k/atari/config.c | 11 ++--------- arch/m68k/atari/time.c | 2 ++ 5 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 arch/m68k/atari/atari.h diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c index 56f02ea2c248d844..23256434191c39af 100644 --- a/arch/m68k/atari/ataints.c +++ b/arch/m68k/atari/ataints.c @@ -52,6 +52,7 @@ #include #include +#include "atari.h" /* * Atari interrupt handling scheme: @@ -81,8 +82,6 @@ __ALIGN_STR "\n\t" "orw #0x200,%sp@\n\t" /* set saved ipl to 2 */ "rte"); -extern void atari_microwire_cmd(int cmd); - static unsigned int atari_irq_startup(struct irq_data *data) { unsigned int irq = data->irq; diff --git a/arch/m68k/atari/atari.h b/arch/m68k/atari/atari.h new file mode 100644 index 0000000000000000..494a03ddac3d16ae --- /dev/null +++ b/arch/m68k/atari/atari.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +struct rtc_time; + +/* ataints.c */ +void atari_init_IRQ(void); + +/* atasound.c */ +void atari_microwire_cmd(int cmd); +void atari_mksound(unsigned int hz, unsigned int ticks); + +/* time.c */ +void atari_sched_init(void); +int atari_mste_hwclk(int op, struct rtc_time *t); +int atari_tt_hwclk(int op, struct rtc_time *t); diff --git a/arch/m68k/atari/atasound.c b/arch/m68k/atari/atasound.c index a8724d998c39fcfa..c38ef0e6078e7260 100644 --- a/arch/m68k/atari/atasound.c +++ b/arch/m68k/atari/atasound.c @@ -28,6 +28,7 @@ #include #include +#include "atari.h" /* * stuff from the old atasound.c diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index b4fe4273ad912ebe..b48a0606a00068b9 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -48,6 +48,8 @@ #include #include +#include "atari.h" + u_long atari_mch_cookie; EXPORT_SYMBOL(atari_mch_cookie); @@ -69,19 +71,10 @@ int atari_rtc_year_offset; static void atari_reset(void); static void atari_get_model(char *model); static void atari_get_hardware_list(struct seq_file *m); - -/* atari specific irq functions */ -extern void atari_init_IRQ (void); -extern void atari_mksound(unsigned int count, unsigned int ticks); #ifdef CONFIG_HEARTBEAT static void atari_heartbeat(int on); #endif -/* atari specific timer functions (in time.c) */ -extern void atari_sched_init(void); -extern int atari_mste_hwclk (int, struct rtc_time *); -extern int atari_tt_hwclk (int, struct rtc_time *); - /* ++roman: This is a more elaborate test for an SCC chip, since the plain * Medusa board generates DTACK at the SCC's standard addresses, but a SCC * board in the Medusa is possible. Also, the addresses where the ST_ESCC diff --git a/arch/m68k/atari/time.c b/arch/m68k/atari/time.c index 7e44d0e9d0f8a902..3453c6dc6b41d3c9 100644 --- a/arch/m68k/atari/time.c +++ b/arch/m68k/atari/time.c @@ -23,6 +23,8 @@ #include #include +#include "atari.h" + DEFINE_SPINLOCK(rtc_lock); EXPORT_SYMBOL_GPL(rtc_lock); From patchwork Wed Sep 13 14:08:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138817 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1116954vqx; Wed, 13 Sep 2023 07:15:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGgfhItIJVj8tU1Aa4zz4xAb1zLUnmDWtX5YMWpZmrZyxfkbxGRTJz/fwXDajhccgvbeCh1 X-Received: by 2002:a17:902:f809:b0:1c3:f09b:2f44 with SMTP id ix9-20020a170902f80900b001c3f09b2f44mr1068962plb.38.1694614514498; Wed, 13 Sep 2023 07:15:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614514; cv=none; d=google.com; s=arc-20160816; b=WqboR4BcH5K67hqJDPXD/8eU+LHdOhOPrWd4jz0Ya30fHVcQxyu+N/9vwtRvSzct0P rbStt4FPXMLB4EosuyQak0Wvv2lcg7ahBePbRoAvDZcac3bEqJV+DEILgp+DdHrqZo1h kbuMpbtsQGUeBOul+I9o6YR+HJGSAhOfnM6orQYecxuc0knk8tU4Lm+XPS5jJ2ceP02t wotpeKjB+ApKzQ2Eu0ksRRvRhFZZ0QCM9JMyRK+VwirItLeY/vGABOhiDRYEOje50oMw SjR8zjjMV4xUGLRbPakK/zwXOOimy9+ignFcak/5WG/4kzf0aL87j5cBDwG+0Ue1xy40 9eCw== 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; bh=vh2TYUNJonlIeWs/tVAZczatv9QG1cU/hJr9iuyzBG4=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=rKcZrlPI+oWsK7FKgAop0Jfr+dmvuZFRuVrQO1sdDRA6BKdROV7dU9OB9HlumBlZsH bTnYivoOf4f6omti1CPhISEQLEKCuPItK6VlMAp10YvmGMlFlOpeh1uXf5L9c4Gaoj8H D1wm3KOIWlWoIMqPQJF5IGXLG+RlaKp6Wa07OifpZR3vMCHrbRhvNa1gVxsjn4XqvNW8 Zg2VknsVfx35it3pvJLNtmZmxV2c1JSnvqig3DbjcE4ynwREcwW5Diqr0vMhe/UR4DfJ OBqjr4zwFMVZbv9wZUd8I3zH63JWcANeFjYHYlYDzpPDU2yjEAKRp+ESngTdRwk5663t gwBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id d2-20020a170903230200b001bb98357332si4821136plh.365.2023.09.13.07.15.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:15:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id C17EF8050609; Wed, 13 Sep 2023 07:09:37 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241362AbjIMOJS (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241267AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84E431BDF for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by baptiste.telenet-ops.be with bizsmtp id lS8n2A0083fvA4V01S8nqF; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csQ-QR; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5C-5J; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 23/52] m68k: apollo: Remove unused debug console functions Date: Wed, 13 Sep 2023 16:08:13 +0200 Message-Id: <5da9036914a5c84c20b6af55f1801f0c734a96bb.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:37 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932108832499782 X-GMAIL-MSGID: 1776932108832499782 When building with W=1: arch/m68k/apollo/config.c:111:5: warning: no previous prototype for ‘dn_serial_console_wait_key’ [-Wmissing-prototypes] 111 | int dn_serial_console_wait_key(struct console *co) { | ^~~~~~~~~~~~~~~~~~~~~~~~~~ arch/m68k/apollo/config.c:118:6: warning: no previous prototype for ‘dn_serial_console_write’ [-Wmissing-prototypes] 118 | void dn_serial_console_write (struct console *co, const char *str,unsigned int count) | ^~~~~~~~~~~~~~~~~~~~~~~ arch/m68k/apollo/config.c:238:6: warning: no previous prototype for ‘dn_dummy_waitbut’ [-Wmissing-prototypes] 240 | void dn_dummy_waitbut(void) { | ^~~~~~~~~~~~~~~~ Fix this by removing these unused functions. The last user of dn_serial_console_write() was removed in v2.3.41. The other functions never had any users. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/apollo/config.c | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 42a8b8e2b664226a..fccbb40772dca6b9 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -108,27 +107,6 @@ static void __init dn_setup_model(void) } -int dn_serial_console_wait_key(struct console *co) { - - while(!(sio01.srb_csrb & 1)) - barrier(); - return sio01.rhrb_thrb; -} - -void dn_serial_console_write (struct console *co, const char *str,unsigned int count) -{ - while(count--) { - if (*str == '\n') { - sio01.rhrb_thrb = (unsigned char)'\r'; - while (!(sio01.srb_csrb & 0x4)) - ; - } - sio01.rhrb_thrb = (unsigned char)*str++; - while (!(sio01.srb_csrb & 0x4)) - ; - } -} - void dn_serial_print (const char *str) { while (*str) { @@ -237,12 +215,6 @@ void dn_dummy_reset(void) { } -void dn_dummy_waitbut(void) { - - dn_serial_print("waitbut\n"); - -} - static void dn_get_model(char *model) { strcpy(model, "Apollo "); From patchwork Wed Sep 13 14:08:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120442vqx; Wed, 13 Sep 2023 07:20:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2awRteDLXUmuACilwMTOf7Sl1CpVeQzT09FGhyzEZCqkJtNJNrcy9ypoxUGimwo9E/X4z X-Received: by 2002:a05:6a00:2e87:b0:68f:f38d:f758 with SMTP id fd7-20020a056a002e8700b0068ff38df758mr2691647pfb.34.1694614803241; Wed, 13 Sep 2023 07:20:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614803; cv=none; d=google.com; s=arc-20160816; b=PS9p8ISxONC5Bg8KYT1bpzIUSHfTXOxqVYGU0WGXQf16dIoCtchB/w00/QwgX+x0t9 8oOBMdoCaVpMkBTUwRRDPouE8oTYIMR2EzuHPYuYLjWJACGKoTnraqT5KX/YOfzEUfmc lkKzgW9Q7lkjcCng+pGkMVA2VM6YZchdzXSLZ6uWKFQ5ORo5a6vMtE7F8IuDR0hPw1eB PiD+cLmKMONvSEm2CQo28QZwvpKgAswQrn3IDL5jChk5oBO2GA704m8YzGYdKw9e4lhU pPb6PnwCGtNhBWzVSutcvgePAh3XenJtZ143J700zkHoNMZCkflw8uSdjczpwwPyThhx uR4A== 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; bh=G5h6NVTKVdDr6L3F/1Bf6yeJTVXTD0jXgcjHWjWPZpc=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=ZYwGjDv4vi9jv3VzzyW5uZ441G8WaFcpZkmKjYu1mF9DpaFim/ovflbu7fMEfbz+eX zSXlLrYJjViIQkCFj1txqLbQBS6cfwrqzE/0Jo1yppK6sZfxG8f3PbEgprkjn0v3WjQL q5cgeSWgeKbY+cuwpUf4KYZmnhlR9Hh96/fyLLkEs64hUtg8ul2k+t3+VA5OBPfFHzem K0/DEQ0SeglmmtQe/ARAzdieLqOwLn3SUFQ9lxsYQmxzyRlYXXMjqg3xwTsOWlvxU3vC izewXTfy4ffI8H5zAl+nuS7VYMJL+t94mfHuUXVN8J1mPfFTlx4S8zArIcpa7wH9ecxN Ppjg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id y20-20020aa78554000000b0068fbf6ba316si5862776pfn.231.2023.09.13.07.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 11F9980C0A63; Wed, 13 Sep 2023 07:10:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241670AbjIMOKn (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52944 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241454AbjIMOJs (ORCPT ); Wed, 13 Sep 2023 10:09:48 -0400 Received: from riemann.telenet-ops.be (riemann.telenet-ops.be [IPv6:2a02:1800:110:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97B7D2106 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by riemann.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF72hfz4x2wC for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by andre.telenet-ops.be with bizsmtp id lS8o2A00R1C8whw01S8oWy; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csT-RF; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5H-6K; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 24/52] m68k: apollo: Make local reset, serial, and irq functions static Date: Wed, 13 Sep 2023 16:08:14 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932412142280023 X-GMAIL-MSGID: 1776932412142280023 When building with W=1: arch/m68k/apollo/config.c:132:6: warning: no previous prototype for ‘dn_serial_print’ [-Wmissing-prototypes] 110 | void dn_serial_print (const char *str) | ^~~~~~~~~~~~~~~ arch/m68k/apollo/dn_ints.c:8:14: warning: no previous prototype for ‘apollo_irq_startup’ [-Wmissing-prototypes] 8 | unsigned int apollo_irq_startup(struct irq_data *data) | ^~~~~~~~~~~~~~~~~~ arch/m68k/apollo/dn_ints.c:19:6: warning: no previous prototype for ‘apollo_irq_shutdown’ [-Wmissing-prototypes] 19 | void apollo_irq_shutdown(struct irq_data *data) | ^~~~~~~~~~~~~~~~~~~ arch/m68k/apollo/dn_ints.c:29:6: warning: no previous prototype for ‘apollo_irq_eoi’ [-Wmissing-prototypes] 29 | void apollo_irq_eoi(struct irq_data *data) | ^~~~~~~~~~~~~~ Fix this by making all local functions static. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/apollo/config.c | 8 ++++---- arch/m68k/apollo/dn_ints.c | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index fccbb40772dca6b9..0e6801eecbaf6361 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -29,7 +29,7 @@ u_long apollo_model; extern void dn_sched_init(void); extern void dn_init_IRQ(void); extern int dn_dummy_hwclk(int, struct rtc_time *); -extern void dn_dummy_reset(void); +static void dn_dummy_reset(void); #ifdef CONFIG_HEARTBEAT static void dn_heartbeat(int on); #endif @@ -107,7 +107,7 @@ static void __init dn_setup_model(void) } -void dn_serial_print (const char *str) +static void dn_serial_print(const char *str) { while (*str) { if (*str == '\n') { @@ -207,8 +207,8 @@ int dn_dummy_hwclk(int op, struct rtc_time *t) { } -void dn_dummy_reset(void) { - +static void dn_dummy_reset(void) +{ dn_serial_print("The end !\n"); for(;;); diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c index 02cff7efc8342aa6..d97251fe0ab83045 100644 --- a/arch/m68k/apollo/dn_ints.c +++ b/arch/m68k/apollo/dn_ints.c @@ -5,7 +5,7 @@ #include #include -unsigned int apollo_irq_startup(struct irq_data *data) +static unsigned int apollo_irq_startup(struct irq_data *data) { unsigned int irq = data->irq; @@ -16,7 +16,7 @@ unsigned int apollo_irq_startup(struct irq_data *data) return 0; } -void apollo_irq_shutdown(struct irq_data *data) +static void apollo_irq_shutdown(struct irq_data *data) { unsigned int irq = data->irq; @@ -26,7 +26,7 @@ void apollo_irq_shutdown(struct irq_data *data) *(volatile unsigned char *)(picb+1) |= (1 << (irq - 8)); } -void apollo_irq_eoi(struct irq_data *data) +static void apollo_irq_eoi(struct irq_data *data) { *(volatile unsigned char *)(pica) = 0x20; *(volatile unsigned char *)(picb) = 0x20; From patchwork Wed Sep 13 14:08:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138815 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1113734vqx; Wed, 13 Sep 2023 07:10:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdQTAbJqeIbkwa8d08qLA2jMMdFLVJSLExHR0hku8LbmOErjsqQMjcpo4abKCAjMcFiQOM X-Received: by 2002:a17:903:2289:b0:1b8:a67f:1c15 with SMTP id b9-20020a170903228900b001b8a67f1c15mr8774053plh.25.1694614246664; Wed, 13 Sep 2023 07:10:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614246; cv=none; d=google.com; s=arc-20160816; b=mxlqfv21V6xssLLQhHQ7JQxMBBzW0gvYf4oUaW0sJsFETnpyAYm/f5aqffK9vbnebf 7SIwUazDP2vbqcTGEGUROge9jrEeeaZ4FcFGmz2xLLPDu4E54ENsAjxTHFKm4TJQEnNL KkAHqSeigJQVqegiABr/dnfTx5ysN5DnQycsO/Vd+a+4QucILPzoMyLqVareodGfQSHx uucmvwMwkcOvxOhEC1VdgZZ5XUg5okbjrMF1BUegS+goeQoKsjbG3P2zPhvSOpEQDHJs f00QXi5YTfQ6RLzXQSZbJddE/Eg/+P3AqUnGXT6NZP7j9UxLcF89WrbKL796pdPzZqHY uQHw== 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; bh=1DVdACuFLAXqgZ8SHbHZsCIitSBnFXnO0EyqKzGpLbI=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=Pql+QnUwjQpIcBCNW8B9ePrCZ9AwsZgik1tanJbK7sqnsNFpn9LVxKYHI6V3c+/bzt hoHX7dQGlPIGw5TgaTyA1zb3AP/Uiqb5+H43lrVu4KcU2wd/Y0oCm/3a05KGoHKlXGlz WUy7Iw7luRNlmtZyRd5A0JM6zO4hERP6iysh1gwJQD7Ey76exYNksTN8seJsXg8L14Lm do6dQrZFeSzlMIQJGfBdk4SheXJHcXo6i1I93exFTNhIGLKfs1/tFX81fTmR5+SCKFB6 wx3Ua1JaGHM+2roNxzt9mcPMyDuGO3FSr8aIXIt9H7Ck9wtwuLIqVF6d2TqIg55Dzt2p rRAw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id d5-20020a170903230500b001c35864fdbbsi10786078plh.406.2023.09.13.07.10.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:10:46 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id E003380BB1EA; Wed, 13 Sep 2023 07:10:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241515AbjIMOKI (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241349AbjIMOJO (ORCPT ); Wed, 13 Sep 2023 10:09:14 -0400 Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [IPv6:2a02:1800:120:4::f00:11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 924721FD3 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PH2nZhz4x9kh for ; Wed, 13 Sep 2023 16:08:51 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by baptiste.telenet-ops.be with bizsmtp id lS8q2A0011C8whw01S8qrq; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csY-TD; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5M-78; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 25/52] m68k: apollo: Replace set but not used variable by READ_ONCE() Date: Wed, 13 Sep 2023 16:08:15 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:42 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931828099167752 X-GMAIL-MSGID: 1776931828099167752 When building with W=1: arch/m68k/apollo/config.c: In function ‘dn_timer_int’: arch/m68k/apollo/config.c:171:32: warning: variable ‘x’ set but not used [-Wunused-but-set-variable] 149 | volatile unsigned char x; | ^ Fix this by using READ_ONCE(), and removing the variable. As READ_ONCE() casts to volatile internally, remove the existing cast. Deduplicate the remaining casts by introducing an intermediary. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by, - Remove volatile and dedup casts, as suggested by Finn. --- arch/m68k/apollo/config.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 0e6801eecbaf6361..7afefb0191504d4e 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -146,13 +146,13 @@ void __init config_apollo(void) irqreturn_t dn_timer_int(int irq, void *dev_id) { - volatile unsigned char x; + unsigned char *at = (unsigned char *)apollo_timer; legacy_timer_tick(1); timer_heartbeat(); - x = *(volatile unsigned char *)(apollo_timer + 3); - x = *(volatile unsigned char *)(apollo_timer + 5); + READ_ONCE(*(at + 3)); + READ_ONCE(*(at + 5)); return IRQ_HANDLED; } From patchwork Wed Sep 13 14:08:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138813 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1113675vqx; Wed, 13 Sep 2023 07:10:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEd/gghvlhMhAVg0JvOQ2Jr2v95Ys9c5w0ja5T5yvlkJrueld/abC/0u62rNHYjw3y8ORif X-Received: by 2002:a05:6808:1054:b0:3a7:a299:1203 with SMTP id c20-20020a056808105400b003a7a2991203mr2211822oih.22.1694614243422; Wed, 13 Sep 2023 07:10:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614243; cv=none; d=google.com; s=arc-20160816; b=PICnUrCAaMJoYzBQnIZ/rNFdjDBhpz7QL0i9Ghvg5hdEi8cDXGY7erXX+k1pAlK7GA sB61V8Lp/UWOP+v4fgD/vHNu+fY0jQ7gK32G1excBnQrZRfoAkiJqK5FjWSXkzEJOLfE /lU5MpW2chyfEk0Nj5XGcIC3thpBLJxz1TW5gFI4t/5veNKDfnHGp9kAhrzBuwwbaBrF wtFlP1y+tNqUrv2dFt/McMWjM0b7uayhDnOBQJ1i2VjuufWFB//NE9Bhn6W57qqUEV62 /aZ4LFFMzodpJ5pBBB0RphoFuDEsdpnb4b4Ng9bSsJgduq2Po4xzdNhy2yk5Y9vUjldG MY9g== 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; bh=ZfhCwpHUZ2SrRNDMXEYjVlYmiCGm8jnC+5gqflXrEow=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=ACDY3z1QWWkFIjarWKPhFOdx446bN1PZosiJRxr7jd4Mur20AK5ITeoRUReel05otU CDPpvsSUoPQCpa+mJVFMAxrsFgkwJszcMooWn3oO8PejbOgwnhfKCT773TScxQhqHIR3 0vtj6J4CwTUQU0cgRpn/f50uu7WWrfneutnWMgekBx+UfRG4feJYAl05aTvoi/WehSOj 4/LfZV0cAcwuVLZUw0SSc8MWtnZS4iLViMROsbDzZ7gBYQccvJC7CwxcykgY/L/pNLK5 gtXw/mPMbnbYU+LVvhmuo+IXZ456rHBOEBEpgAr6Xi61NmZmaEQjAP/Vqrdi8nedpwoG 4OjA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id j63-20020a638042000000b0056c297d1640si8114452pgd.528.2023.09.13.07.10.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:10:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 8BCF181DDBF4; Wed, 13 Sep 2023 07:09:26 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241330AbjIMOJN (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241246AbjIMOIz (ORCPT ); Wed, 13 Sep 2023 10:08:55 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 547431BCE for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by baptiste.telenet-ops.be with bizsmtp id lS8n2A00E3fvA4V01S8nqH; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csZ-Tn; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5R-88; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 26/52] m68k: apollo: Add and use "apollo.h" Date: Wed, 13 Sep 2023 16:08:16 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:26 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931825161809618 X-GMAIL-MSGID: 1776931825161809618 When building with W=1: arch/m68k/apollo/dn_ints.c:43:13: warning: no previous prototype for ‘dn_init_IRQ’ [-Wmissing-prototypes] 43 | void __init dn_init_IRQ(void) | ^~~~~~~~~~~ Fix this by introducing a new header file "apollo.h" for holding the prototypes of functions implemented in arch/m68k/apollo/. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/apollo/apollo.h | 4 ++++ arch/m68k/apollo/config.c | 3 ++- arch/m68k/apollo/dn_ints.c | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 arch/m68k/apollo/apollo.h diff --git a/arch/m68k/apollo/apollo.h b/arch/m68k/apollo/apollo.h new file mode 100644 index 0000000000000000..1fe9d856df30354c --- /dev/null +++ b/arch/m68k/apollo/apollo.h @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +/* dn_ints.c */ +void dn_init_IRQ(void); diff --git a/arch/m68k/apollo/config.c b/arch/m68k/apollo/config.c index 7afefb0191504d4e..e161ecd76035862d 100644 --- a/arch/m68k/apollo/config.c +++ b/arch/m68k/apollo/config.c @@ -17,6 +17,8 @@ #include #include +#include "apollo.h" + u_long sio01_physaddr; u_long sio23_physaddr; u_long rtc_physaddr; @@ -27,7 +29,6 @@ u_long timer_physaddr; u_long apollo_model; extern void dn_sched_init(void); -extern void dn_init_IRQ(void); extern int dn_dummy_hwclk(int, struct rtc_time *); static void dn_dummy_reset(void); #ifdef CONFIG_HEARTBEAT diff --git a/arch/m68k/apollo/dn_ints.c b/arch/m68k/apollo/dn_ints.c index d97251fe0ab83045..ba96a92f8f18f00a 100644 --- a/arch/m68k/apollo/dn_ints.c +++ b/arch/m68k/apollo/dn_ints.c @@ -5,6 +5,8 @@ #include #include +#include "apollo.h" + static unsigned int apollo_irq_startup(struct irq_data *data) { unsigned int irq = data->irq; From patchwork Wed Sep 13 14:08:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138826 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120139vqx; Wed, 13 Sep 2023 07:19:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFM0n6VSBKHpGVRX7N1QKz3+amxnmO46zV4mkH2EcuMW/NGuFMZfWx2FeodsXbxoylLj9nr X-Received: by 2002:a05:6a21:1f2a:b0:14c:d494:77d0 with SMTP id ry42-20020a056a211f2a00b0014cd49477d0mr2104332pzb.26.1694614777862; Wed, 13 Sep 2023 07:19:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614777; cv=none; d=google.com; s=arc-20160816; b=U/MA5esFI3HIVzMqgnOc42NS+6RoO/6MrY3kpkjChGYYuhYKxqhj9vQ4y+z0u3l+gE 1JKCPwvoH6zsJg2lXh+6iyXt+nEGdeqpt+9xO6EraT8FhRrZjTNaYpTWpoxDzdkfp0r/ O3/YDwii3n81lpXeeYs77+3+19njUsmW8YLIqL747lPGT4b/6UqMqtceRsuAEZVvdqxq 1D6pMfDZcNMlw5xVgPOBQqFWkh55VSJ9E/f3qQ5XqVEYoTO7A21Z27C53Cf+awCeOaby aBoF+I82KDbGFhzXFubXjRwiVsjqZQewMHfpdSO6z5uJBKQ692DL0ueLd2j/GT8veEvQ pi9w== 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; bh=JpB8ihQMwHIXkSAdgFq5kwV1i61ch79rlQQzjwXgdb0=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=wzUgALPoeGMNyfN/vHzhtv5fUeP6h2G2sshyETTRAA2xex/CDZIMv58yCqfnZebX8q ZDqnSCACI682oYIYkSd5RvNP0oX3Lz+r6+P7KgBCv+vhF+vRXmfYI4M3+sWeduQlvhIg 1ReJdxRu4OZIBCrCnPwWUaS0IHCjZlnzciyeD0UmLJVysBJmltLs9OwEdEacSDxbOuTb bQB4xPPhh94yTfWVtRyzcoEWQ7V5dVQLpFGb3Ea90Eg3Yr6nnZioP6FLrCxSayWG+fIA GqNLll+Mm/iBtGs2BwjRmirVzfYZVpn84agq1C+rpcBAaUZwlALzlat1nQy1mTNF+AJu Z6Zw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id v69-20020a638948000000b00557531eafb0si10009268pgd.559.2023.09.13.07.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:19:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3650280BBC6B; Wed, 13 Sep 2023 07:10:02 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241261AbjIMOJu (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231767AbjIMOI5 (ORCPT ); Wed, 13 Sep 2023 10:08:57 -0400 Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [195.130.137.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8615D1BE9 for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG1JWnz4xHCS for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by xavier.telenet-ops.be with bizsmtp id lS8o2A00x3fvA4V01S8o3c; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csc-Uk; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5X-9x; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 27/52] m68k: bvme6000: Make bvme6000_abort_int() static Date: Wed, 13 Sep 2023 16:08:17 +0200 Message-Id: <4da40748e1d7d56b73840a1d7ab1cb9c9a59cef2.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:02 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932385023856897 X-GMAIL-MSGID: 1776932385023856897 When building with W=1: arch/m68k/bvme6000/config.c:133:13: warning: no previous prototype for ‘bvme6000_abort_int’ [-Wmissing-prototypes] 133 | irqreturn_t bvme6000_abort_int (int irq, void *dev_id) | ^~~~~~~~~~~~~~~~~~ Fix this by making bvme6000_abort_int() static. There was never a user outside arch/m68k/bvme6000/config.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/bvme6000/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/bvme6000/config.c b/arch/m68k/bvme6000/config.c index 3a1d90e399e016cf..e604fe6602461334 100644 --- a/arch/m68k/bvme6000/config.c +++ b/arch/m68k/bvme6000/config.c @@ -130,7 +130,7 @@ void __init config_bvme6000(void) } -irqreturn_t bvme6000_abort_int (int irq, void *dev_id) +static irqreturn_t bvme6000_abort_int(int irq, void *dev_id) { unsigned long *new = (unsigned long *)vectors; unsigned long *old = (unsigned long *)0xf8000000; From patchwork Wed Sep 13 14:08:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138854 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1123772vqx; Wed, 13 Sep 2023 07:25:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPzMlY03KLOIy9j502lq9QSRgHIprGuHAo3atq4gsUaXWDluvUbsWWCEZe8JiWfx5S22LT X-Received: by 2002:a05:6a00:2296:b0:68a:6926:78ac with SMTP id f22-20020a056a00229600b0068a692678acmr3054744pfe.22.1694615110915; Wed, 13 Sep 2023 07:25:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615110; cv=none; d=google.com; s=arc-20160816; b=kRwIqIY+qKRulLPAIPbjfD0mG1oPOW05eVA0uE5okIbJwcAeBIauTZlxqEqJmsNj7P YTT8KGVVK9Brhn7pHZhSiiYeGF0xs8CPXiXs9+Wj6Y5sLetUulUfhh73HUtmG7GNIpNV SFhm5NL3fmfuCzP2PCBMFoYn181l4fRO2LldDBU9l54Z9JhhIY0zB+dR62eJD0+RPlt4 oodqrDR9Byp+xXs+VnE44kf7v+mnFbwBPQz6ademj1/AyLrzBuqWDvf/dJNGJ7h3BnaD Q8jqbirAY0Nnnb1nZQD1rrW57VJ7S8Nw5g8cObvXSYlR6VrQGyxX1cuXWZ94cvU20UP0 rXug== 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; bh=OSfWYCR/D9LN8psYFDgRgEoGrxXb1luaosmephR4sYg=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=AV0ykBco6fm7T+Gf/uoEH5hgBmfz42adXOyzN+sgiZUal5w4lvBWNCqpjhiDED5Ciz h1nprUTKT9xOIc9DSf2f6Cp+9pcUzu0wJrl8awghsuHaWYt1cAtHITmPEe0ZRhen/2ye a6C/MVEUXNmk2jQuVU6N+/R/JjR5NemxRT1zcegMcpdbKnvcF4dZ2pKftsMhZcmCKgpZ F15nArqJ0ogmsovPPxBTBxCWYzjUtp1EJ0mKoTY4jyR/WCY1kOB+15v0M44JSQ3x3kem PTnVSyk7SnuW2BcJt6iOxKjZWAq9+RUnSqlXLHzAFSAo+SSh/7/xZM77cf5mh9/ESEzM zNxA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id m16-20020a056a00081000b0068e32814eeesi10563406pfk.317.2023.09.13.07.25.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:25:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id EB96F809268D; Wed, 13 Sep 2023 07:10:53 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241373AbjIMOK0 (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241383AbjIMOJX (ORCPT ); Wed, 13 Sep 2023 10:09:23 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48CB61BF7 for ; Wed, 13 Sep 2023 07:08:52 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8n2A00F3fvA4V06S8n47; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXd-003csi-VU; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5c-Ai; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 28/52] m68k: hp300: Include "time.h" for hp300_sched_init() Date: Wed, 13 Sep 2023 16:08:18 +0200 Message-Id: <630ee35241dc753a30b69adedc2ffa8fc6d551dd.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:54 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932734745449372 X-GMAIL-MSGID: 1776932734745449372 When building with W=1: arch/m68k/hp300/time.c:101:13: warning: no previous prototype for ‘hp300_sched_init’ [-Wmissing-prototypes] 101 | void __init hp300_sched_init(void) | ^~~~~~~~~~~~~~~~ Fix this by including "time.h". Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/hp300/time.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/m68k/hp300/time.c b/arch/m68k/hp300/time.c index 1d1b7b3b5dd41583..72621fb9f3e663bd 100644 --- a/arch/m68k/hp300/time.c +++ b/arch/m68k/hp300/time.c @@ -20,6 +20,8 @@ #include #include +#include "time.h" + static u64 hp300_read_clk(struct clocksource *cs); static struct clocksource hp300_clk = { From patchwork Wed Sep 13 14:08:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138848 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1122713vqx; Wed, 13 Sep 2023 07:23:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHXasscFjJgFPqDpRjj95GF3AeE3GRpYYvWyNWn7VUaodAv8im3n+xxmX1HmNREJkH8sN81 X-Received: by 2002:a17:902:bf49:b0:1bf:728:745b with SMTP id u9-20020a170902bf4900b001bf0728745bmr2649883pls.49.1694615005491; Wed, 13 Sep 2023 07:23:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615005; cv=none; d=google.com; s=arc-20160816; b=iho/ZH5yIbC0nbJ2UOt1vDnstj3iohOrNBuOjCCsMWXtOSN0DuThmBYRlntLtC+BtJ oBr8z7sFoFmEotkiY8u0V6ha87y+yl6aZWHG295feLCLArecT9povQDt/Q32FJfjCOTm 0OxBRgg+VgOSquV++FIaz+lpmPXGJob3Ef0VJxXMjeH6SkPii1iTR5I4z7V8E2k+Lv1r DiNLFXkIC4PiV2VVQWji/ai5oED51KLNALFwoZa4Z6SJGXWOzD1Ydykw1zktBdRHpUgH ISbkY8vAQ/llbjHTb5mUbYN6tDZQyu/CmmW7jrIRZoDFW5tGrrNR6oRhiZMhqT4Caj3B eaqQ== 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; bh=TmFLdVgj4Ahh+ej7r7Fe+54b0iGRaa9uiPEB9P7/HaQ=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=FhTU2OZYmn3R+aJvkh4TtoK8tQaBWisbW+LjZd7FCqKU9TDE3KBue28j5BFnmtW8yf m3tR/MDwwoSaK/pCBrjGzVqadAX/p7fbE8hAZHoL2UwCv0g21q/hz4WqFyYgkt3U6d2+ SALMaCEYKCU58NL8JrstoeqxOAXx1lvCp6MlA1l9LqWN7jBwEX6bACkWDaG8/eyNO/yW 2EjsKebQ847MkNgqvs+gDqB6TjN4qG0vMdHtCkueMmMTBrneU4HlrCfBKvpLlrmF6w3r Dyq6TD1+jr5W8bfYkQq+SrwFl+lWXyhTb/WQeZhz7MRTkuXMFJzBZ8zlnZ/rFQS4O0fM 0czw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id c1-20020a170902d48100b001c3b5a13286si6015477plg.20.2023.09.13.07.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:23:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 5736A803F131; Wed, 13 Sep 2023 07:11:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241697AbjIMOKv (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241489AbjIMOKC (ORCPT ); Wed, 13 Sep 2023 10:10:02 -0400 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FBE02118 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by michel.telenet-ops.be with bizsmtp id lS8p2A00W3fvA4V06S8qJZ; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003csm-07; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5g-BU; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 29/52] m68k: mac: Remove unused sine_data[] Date: Wed, 13 Sep 2023 16:08:19 +0200 Message-Id: <75dbc0a141490daf9febfb8cb4a43ae87fbe3352.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:21 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932623933778205 X-GMAIL-MSGID: 1776932623933778205 When building with W=1: arch/m68k/mac/macboing.c:29:26: warning: ‘sine_data’ defined but not used [-Wunused-const-variable=] 29 | static const signed char sine_data[] = { | ^~~~~~~~~ The predefined sine table was superseded by a table calculated at run-time in v2.2.0. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/mac/macboing.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/arch/m68k/mac/macboing.c b/arch/m68k/mac/macboing.c index 4de6229c7bfdebce..76431241347682fc 100644 --- a/arch/m68k/mac/macboing.c +++ b/arch/m68k/mac/macboing.c @@ -22,15 +22,6 @@ static int mac_asc_inited; */ static __u8 mac_asc_wave_tab[ 0x800 ]; -/* - * Alan's original sine table; needs interpolating to 0x800 - * (hint: interpolate or hardwire [0 -> Pi/2[, it's symmetric) - */ -static const signed char sine_data[] = { - 0, 39, 75, 103, 121, 127, 121, 103, 75, 39, - 0, -39, -75, -103, -121, -127, -121, -103, -75, -39 -}; - /* * where the ASC hides ... */ From patchwork Wed Sep 13 14:08:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138812 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1113543vqx; Wed, 13 Sep 2023 07:10:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHn8kSMhzTfr9wVZRuLBK7DKjP7Eh9jtjz7wq1wofr14hDIkUSJJxO9arnkFUHi/HH3IEnW X-Received: by 2002:a92:c56d:0:b0:34c:b981:52d4 with SMTP id b13-20020a92c56d000000b0034cb98152d4mr2908026ilj.31.1694614236143; Wed, 13 Sep 2023 07:10:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614236; cv=none; d=google.com; s=arc-20160816; b=rPmtFrn5Gj8ZXM8+wbgx05KKDaiLVa5I4lXzzVEE9tN0uCrARay7tcfExUdVhgNSft A364zJmJ1BAy/m516LhClDnFN4WS1gFjFVFPmrRrONan8MPxUF/LZBVZpODW1rQ4Fi/a uCXcqcMUyJjlwhzY7RGzAy63OyhNGYIBRu0i5wnIQfHSU5O+jfUVRmJcNew9Vmmdl0/R b/Pfd3Xtt1pKCl9QDyXjXKXVz9N3B+hh+LsYjTMlYR7zly5A0hc2Pz4uwHoCfeH4G6S+ Qpk+wX2tAYpasSrVP5ZWtpm09VgJq5QNtBgH0txRLzT64BL9/yqUX0e3EOE5BXIiTaef Mmog== 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; bh=cYAUmGja78KixbAbs6NEtpY0r6PeQr9UgBRDPuf7jY8=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=xAq0Pmv8MeJiNORgfWQoYD+GyDmfaMn3i7+JGTe4eCXUY2h29/xjLTJ7D70Lf4/nDd NhwPav0KMaoNeX59LKD/i+Bbt8EiAGm6DWE/qr+4+2Qv4sdT5ysLVwuPVLZz9SdgmUKl K74BGtqp3WxcgHEuNOmxzyGVFPFtvMiOrgvMGE130KZ6syJI5PdfE/3LS+3qwoFV3NE4 kHmY2VtW4oaI9LZ94+D7A61rz2moZt7HmDg1jSCJGSK3BdbbGaXoiPDN/Ddmflr37vP4 1kzVn148e1ZZHuoad5uDdkJvNeLpLNyF1zmfh8HnxRuuckVtSlt4sJQQrbPjVxwsHSiH KFZg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id a6-20020a631a46000000b00577bf1de778si2363100pgm.585.2023.09.13.07.10.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:10:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id B89BA80BB1D8; Wed, 13 Sep 2023 07:10:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241317AbjIMOJ5 (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241311AbjIMOJN (ORCPT ); Wed, 13 Sep 2023 10:09:13 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [195.130.132.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B82361BEF for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG1Kw0z4x7bJ for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by baptiste.telenet-ops.be with bizsmtp id lS8o2A00x1C8whw01S8orG; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003css-1g; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5k-CF; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 30/52] m68k: mac: Remove unused yday in unmktime() Date: Wed, 13 Sep 2023 16:08:20 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:31 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931816905830569 X-GMAIL-MSGID: 1776931816905830569 When building with W=1: arch/m68k/mac/misc.c: In function ‘unmktime’: arch/m68k/mac/misc.c:557:33: warning: variable ‘yday’ set but not used [-Wunused-but-set-variable] 557 | int days, rem, y, wday, yday; | ^~~~ Fix this by removing the unused variable and assignment. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/mac/misc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index c7cb29f0ff016360..65107abc8848232c 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -554,7 +554,7 @@ static void unmktime(time64_t time, long offset, /* Leap years. */ { 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 } }; - int days, rem, y, wday, yday; + int days, rem, y, wday; const unsigned short int *ip; days = div_u64_rem(time, SECS_PER_DAY, &rem); @@ -592,7 +592,6 @@ static void unmktime(time64_t time, long offset, y = yg; } *yearp = y - 1900; - yday = days; /* day in the year. Not currently used. */ ip = __mon_yday[__isleap(y)]; for (y = 11; days < (long int) ip[y]; --y) continue; From patchwork Wed Sep 13 14:08:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138856 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1124313vqx; Wed, 13 Sep 2023 07:26:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEAv5dPrVD1pfAXX+nbeMCXnUrC7LnHw7yqW7blP4SUCZCSJ6TZ7BHK3KJWxG7ISnNxAfca X-Received: by 2002:a17:903:452:b0:1c0:deb4:9cd1 with SMTP id iw18-20020a170903045200b001c0deb49cd1mr2652311plb.15.1694615165874; Wed, 13 Sep 2023 07:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615165; cv=none; d=google.com; s=arc-20160816; b=WJfQ7B49Ap5q44o7gf+KDhvKIv2xp58vKOR8/+/RQ9vqEK7XJgMrxC2VLVlk/vkUTL PSZOnixN+i4AKyvY+ET+zEHYw9Zo2RX/3/xlqI9xQnbZZ0KYCL9qIBc8rUEpn+P1fB8G QupsxMsnuJah/s3JoIQGD/lpQrbUjy7CiqVeZifNjET+wNK5V45vwfDd7c12s0Y8tY7n ued4jSlZbCs4NKSrdnDdNVivhsQzbRam5yksu3VqeIQkC9CyguHGs5k2UiUynqASKVQ5 SbVKkHukgOU3I720IWIpNLqL7aMo0gWyuSLYTzvAn51TaRpEGHF+V1cfKu3K71li1B3d 6kDw== 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; bh=EW7KoO+AUIS5rdCLMdm/ztI5SS67bJlzYnVPxksPMvw=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=Y4T/3uduIS9pIokaqi2OAgswocZ09h47EFKs9YEt+TYLGmAJOeqhgWqub7kYqZvUnW kqTlSzalec6j/QtTipTGaxqidgETESUI46088bpZcA+shpi4DZFL0Vdt0cJZAdLG6hMF nHSf+8UdqSH418k/iPIozUE/DaZIihjWYV8GXKW8NKdZ2Gc+gjjKHDthqGnOaY4KAr+o 7U/L+jnDseUXOqs2rD2y0E1f2J+4XoUCEbymxoKaIG+ujY7PK+cBNzJIoARj+yLJKmMM EuORrZEjJFn2mGHfQZ9lItD3z2xfBuVrNxcT5+aYajHy7XjFeEm4i8h8MK+cC5HVt/bW 8dDQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id u15-20020a170903124f00b001beeb49d890si10764272plh.185.2023.09.13.07.26.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:26:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 6F4178131C06; Wed, 13 Sep 2023 07:10:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241475AbjIMOJz (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241329AbjIMOJN (ORCPT ); Wed, 13 Sep 2023 10:09:13 -0400 Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [195.130.137.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B812E1BEC for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG1RzXz4xHCT for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by xavier.telenet-ops.be with bizsmtp id lS8o2A01E1C8whw01S8o3e; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003csu-2Q; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5o-D3; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 31/52] m68k: mac: Make mac_platform_init() static Date: Wed, 13 Sep 2023 16:08:21 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:50 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932791878050673 X-GMAIL-MSGID: 1776932791878050673 When building with W=1: arch/m68k/mac/config.c:961:12: warning: no previous prototype for ‘mac_platform_init’ [-Wmissing-prototypes] 961 | int __init mac_platform_init(void) | ^~~~~~~~~~~~~~~~~ Fix this by making mac_platform_init() static. There was never a user outside arch/m68k/mac/config.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/mac/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 382f656c29eaeef2..d56affefd5cabeb5 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -958,7 +958,7 @@ static const struct pata_platform_info mac_pata_data __initconst = { .ioport_shift = 2, }; -int __init mac_platform_init(void) +static int __init mac_platform_init(void) { phys_addr_t swim_base = 0; From patchwork Wed Sep 13 14:08:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138831 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120474vqx; Wed, 13 Sep 2023 07:20:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEBilShUkpChl+wq4O3lT1qRgtYw91z4b4rLZQM5Jr7OqEVxKvOMdZvyUe2Qu4e6S4WA2eI X-Received: by 2002:aca:1c18:0:b0:3a4:57a7:b30e with SMTP id c24-20020aca1c18000000b003a457a7b30emr2759034oic.26.1694614805241; Wed, 13 Sep 2023 07:20:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614805; cv=none; d=google.com; s=arc-20160816; b=nLAqnEMLCUCnXDuxG+MKT6JtkMnODZvt+S0czU2Zv3EaI0HZ+LN3+zHt7/kap3OA37 BN7EO6Uz1dEmTPJ7JgYVuYiBtdV9Htsc8A7uLioFg59v25G0dKF3Y13jNaHXFnPwY4YJ DsNoCFBarGB/C50pUKzWYRa9hrNYUeu/yzX2X9/XXZh9dbm7/a49T7XVqTb/lKuUEm16 0SEMUKrUq9wOU5tJzBjsc1pYO3Lmt8e2iSr9VE4aEART7k+72NgjwwEFk1l5ruFAGkU6 nZejKQwwr+6YoVRtJeHehT3EleeeOKa3W1GE7JILiVuzrAEny0V29OpTIpgWbP2fxw4R uOOA== 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; bh=1PGt7KFiaxdGU2pNB9Ea0b+MyypcU7J4ocvWFj0AAIA=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=xir/Pm6ARxmmVEoozos8eMf4wYQMdAedKzyc21nRb1lyyspEouPnVRnijQFmiOeAo1 V+3My3G+Yx1iaRKvxboiuf9GSx6PfP0jYFT2KK0qIOzHjhsWnqS0/6KpPFC4RYq2K4I4 nJQGM8XgKjpv6UBMpVscqQjRKef82zU7gqM9DVIqtKIAiwuJg1Y0oTPdMVCZ5Dm/okzl 3zamzN70VJcqjUrKwD6bgL3BpcAC/WjJ/ebZb0EayFRjiVWegnZOY6Xt3CL056tjGPHI 9voUXtkdGgQoj7lAuKPeUzJRHqiiOvOj6VPlWMuys/armYOTklFc4ishWShG4I8KezU6 N4pg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id t23-20020a656097000000b0056c403cd154si9748979pgu.595.2023.09.13.07.20.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:05 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id D22C380C03A3; Wed, 13 Sep 2023 07:10:23 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241436AbjIMOKR (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241377AbjIMOJW (ORCPT ); Wed, 13 Sep 2023 10:09:22 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 440381BD4 for ; Wed, 13 Sep 2023 07:08:52 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8n2A00D3fvA4V01S8nmG; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003csx-3N; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV5w-Ej; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 32/52] m68k: mac: Add and use "mac.h" Date: Wed, 13 Sep 2023 16:08:22 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:23 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932414177956462 X-GMAIL-MSGID: 1776932414177956462 When building with W=1: arch/m68k/mac/iop.c:235:13: warning: no previous prototype for ‘iop_init’ [-Wmissing-prototypes] 235 | void __init iop_init(void) | ^~~~~~~~ arch/m68k/mac/via.c:112:13: warning: no previous prototype for ‘via_init’ [-Wmissing-prototypes] 111 | void __init via_init(void) | ^~~~~~~~ arch/m68k/mac/via.c:623:13: warning: no previous prototype for ‘via_init_clock’ [-Wmissing-prototypes] 593 | void __init via_init_clock(void) | ^~~~~~~~~~~~~~ arch/m68k/mac/oss.c:37:13: warning: no previous prototype for ‘oss_init’ [-Wmissing-prototypes] 37 | void __init oss_init(void) | ^~~~~~~~ arch/m68k/mac/psc.c:76:13: warning: no previous prototype for ‘psc_init’ [-Wmissing-prototypes] 76 | void __init psc_init(void) | ^~~~~~~~ arch/m68k/mac/baboon.c:25:13: warning: no previous prototype for ‘baboon_init’ [-Wmissing-prototypes] 25 | void __init baboon_init(void) | ^~~~~~~~~~~ arch/m68k/mac/macboing.c:155:6: warning: no previous prototype for ‘mac_mksound’ [-Wmissing-prototypes] 155 | void mac_mksound( unsigned int freq, unsigned int length ) | ^~~~~~~~~~~ arch/m68k/mac/misc.c:608:5: warning: no previous prototype for ‘mac_hwclk’ [-Wmissing-prototypes] 608 | int mac_hwclk(int op, struct rtc_time *t) | ^~~~~~~~~ Fix this by introducing a new header file "mac.h" for holding the prototypes of functions implemented in arch/m68k/mac/. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/mac/baboon.c | 2 ++ arch/m68k/mac/config.c | 12 ++---------- arch/m68k/mac/iop.c | 2 ++ arch/m68k/mac/mac.h | 25 +++++++++++++++++++++++++ arch/m68k/mac/macboing.c | 2 ++ arch/m68k/mac/misc.c | 2 ++ arch/m68k/mac/oss.c | 2 ++ arch/m68k/mac/psc.c | 2 ++ arch/m68k/mac/via.c | 2 ++ 9 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 arch/m68k/mac/mac.h diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c index a7d280220662c747..5c97a7058bcdee2e 100644 --- a/arch/m68k/mac/baboon.c +++ b/arch/m68k/mac/baboon.c @@ -15,6 +15,8 @@ #include #include +#include "mac.h" + int baboon_present; static volatile struct baboon *baboon; diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index d56affefd5cabeb5..e324410ef239c09f 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -50,22 +50,14 @@ #include #include +#include "mac.h" + /* Mac bootinfo struct */ struct mac_booter_data mac_bi_data; /* The phys. video addr. - might be bogus on some machines */ static unsigned long mac_orig_videoaddr; -extern int mac_hwclk(int, struct rtc_time *); -extern void iop_init(void); -extern void via_init(void); -extern void via_init_clock(void); -extern void oss_init(void); -extern void psc_init(void); -extern void baboon_init(void); - -extern void mac_mksound(unsigned int, unsigned int); - static void mac_get_model(char *str); static void mac_identify(void); static void mac_report_hardware(void); diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index 010b3b5ae8e8584a..a92740d530ac4fbe 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c @@ -119,6 +119,8 @@ #include #include +#include "mac.h" + #ifdef DEBUG #define iop_pr_debug(fmt, ...) \ printk(KERN_DEBUG "%s: " fmt, __func__, ##__VA_ARGS__) diff --git a/arch/m68k/mac/mac.h b/arch/m68k/mac/mac.h new file mode 100644 index 0000000000000000..d3d142cea3b4b911 --- /dev/null +++ b/arch/m68k/mac/mac.h @@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +struct rtc_time; + +/* baboon.c */ +void baboon_init(void); + +/* iop.c */ +void iop_init(void); + +/* misc.c */ +int mac_hwclk(int op, struct rtc_time *t); + +/* macboing.c */ +void mac_mksound(unsigned int freq, unsigned int length); + +/* oss.c */ +void oss_init(void); + +/* psc.c */ +void psc_init(void); + +/* via.c */ +void via_init(void); +void via_init_clock(void); diff --git a/arch/m68k/mac/macboing.c b/arch/m68k/mac/macboing.c index 76431241347682fc..faea2265a540192d 100644 --- a/arch/m68k/mac/macboing.c +++ b/arch/m68k/mac/macboing.c @@ -16,6 +16,8 @@ #include #include +#include "mac.h" + static int mac_asc_inited; /* * dumb triangular wave table diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 65107abc8848232c..4c8f8cbfa05f3404 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -25,6 +25,8 @@ #include +#include "mac.h" + /* * Offset between Unix time (1970-based) and Mac time (1904-based). Cuda and PMU * times wrap in 2040. If we need to handle later times, the read_time functions diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c index 921e6c092f2c6626..1641607f300d981c 100644 --- a/arch/m68k/mac/oss.c +++ b/arch/m68k/mac/oss.c @@ -27,6 +27,8 @@ #include #include +#include "mac.h" + int oss_present; volatile struct mac_oss *oss; diff --git a/arch/m68k/mac/psc.c b/arch/m68k/mac/psc.c index 0d0965b19c09b439..b4183cf66efef7f5 100644 --- a/arch/m68k/mac/psc.c +++ b/arch/m68k/mac/psc.c @@ -26,6 +26,8 @@ #include #include +#include "mac.h" + #define DEBUG_PSC volatile __u8 *psc; diff --git a/arch/m68k/mac/via.c b/arch/m68k/mac/via.c index 3d11d6219cdd56da..01e6b0e37f8dd0e8 100644 --- a/arch/m68k/mac/via.c +++ b/arch/m68k/mac/via.c @@ -38,6 +38,8 @@ #include #include +#include "mac.h" + volatile __u8 *via1, *via2; int rbv_present; int via_alt_mapping; From patchwork Wed Sep 13 14:08:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139021 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6779vqb; Wed, 13 Sep 2023 11:35:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGI3I44YZxi6TIl+RJOAx/Xmvzjf3lpvqak1c2O5mazqT+2k+Rc1Fb2JJZG1JRaykoRaSTC X-Received: by 2002:a05:6a00:2a06:b0:690:25fb:bac1 with SMTP id ce6-20020a056a002a0600b0069025fbbac1mr614534pfb.18.1694630102967; Wed, 13 Sep 2023 11:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630102; cv=none; d=google.com; s=arc-20160816; b=J4dCrRcrMGkgaWS4xfT5YY8dKMxh6u3WFIPUDAiPLDMXCkOttTqucU+QcyaWMin42M f/KMRCXG/vz/WqwO8p+24ezhrqxRabo1MyDMWW1AEd5+seSQLNHTd66RBhQ29jquGhpw g0eAH8c3b4JLm410GAZ4jZwGgxJ/1EkZUfc77YJBOEBJ2CQgbrXkNhtsw4e31VSZrj8I aPqVx1XC6LTpu5jQaZ2FJrhJDy9+RU6MpAaJ/RPCtEz13XNgtgvS3+ik5QCJRlOrNke0 HLWMljVNiMF2LKnGQHxnTZCXxqZ9wHB2NXlRvZpf7Y+gFUPZ0tOJHfj22a137Jr5S7A0 Z2Xw== 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; bh=Ox4aDBlW9ZlokvXp780broueb+1QXG5aqxXSv5DBNTs=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=ryPQo9Tm5eVS5ORp/KDF5Tox+BxKakU69Zcnb6zBx/10HUOxPr/UwJl/exFnYu9HKs 5F7T/2FuwYwJyCwKHO2zF/LSobYrvYqrLMbz9NPCoYdslyeosepNyuRyLt9naiCayEzA 8JcZq/UCiffgGn5D8eGlupbGQS9laGXHcpf5BKc8pDb+K/YZzTRK11V2xBpEVoYl7Xmy xBKezOCoSCg9+n9sY03GumtreBPy8WwCY2ZTNsLr1X1O7wKepfZZdTlhpkLwBirUre2T +GFKEzHNpWPTL+b8qg/U+orNph8A4eILBDspNH6TdBaNCqp6SrSwmuJ1rWZyep+u1S82 gUoQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id l62-20020a639141000000b0057759a5b7ccsi7562986pge.305.2023.09.13.11.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:35:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 4B39C83EE9EF; Wed, 13 Sep 2023 07:10:00 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241464AbjIMOJw (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241295AbjIMOI5 (ORCPT ); Wed, 13 Sep 2023 10:08:57 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86D691BEA for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8n2A00C3fvA4V01S8nmF; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ct1-4F; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV61-FZ; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 33/52] m68k: mvme147: Make mvme147_init_IRQ() static Date: Wed, 13 Sep 2023 16:08:23 +0200 Message-Id: <853e29ca81761032c3af132fffbd583b667234a6.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:00 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948454728473419 X-GMAIL-MSGID: 1776948454728473419 When building with W=1: arch/m68k/mvme147/config.c:76:13: warning: no previous prototype for ‘mvme147_init_IRQ’ [-Wmissing-prototypes] 76 | void __init mvme147_init_IRQ(void) | ^~~~~~~~~~~~~~~~ Fix this by making mvme147_init_IRQ() static. The function body was moved to arch/m68k/mvme147/config.c in v2.6.18. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/mvme147/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/mvme147/config.c b/arch/m68k/mvme147/config.c index 4e6218115f43ce56..7dfacd0b207a9750 100644 --- a/arch/m68k/mvme147/config.c +++ b/arch/m68k/mvme147/config.c @@ -73,7 +73,7 @@ static void mvme147_get_model(char *model) * the mvme147 IRQ handling routines. */ -void __init mvme147_init_IRQ(void) +static void __init mvme147_init_IRQ(void) { m68k_setup_user_interrupt(VEC_USER, 192); } From patchwork Wed Sep 13 14:08:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139020 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6744vqb; Wed, 13 Sep 2023 11:35:01 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHiPhiERbnnFCdRaZx15EnHIIVSEYPe75ufIC1wxjMQ6N72LJv3V5znhjGM8fIQ41Muofkg X-Received: by 2002:a05:6a20:1614:b0:13f:d171:fd6d with SMTP id l20-20020a056a20161400b0013fd171fd6dmr3691031pzj.51.1694630101457; Wed, 13 Sep 2023 11:35:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630101; cv=none; d=google.com; s=arc-20160816; b=qCoDsvW6E/5rJ6mDkTxT7XAmF2E8PQZgJeDHRoMt1VD7h76KQDeJhFPdnwPM5xVrkp S8uc2SeO8jkyHsY+8KQzR2XFsB/+8/UMxDrWDEs5HwFkj32Xw1XINIV77reAkAIkzB39 muW0DIOF/DDvnNbGZgLNR3Cwg7bHTzK9gScrmLglSFph4DIzrCjgaIyhNq1sVTjTT6pn l272VBizkKSqK5TfJY7+Bw82dtOHLCYr5QbLVkpJgOcqekUpirbTHYz518Yd6Dgg+Lf+ hjwwXW9YDGyi5xvSSXpcSzpzjVIXO+XEitxioaZzwsMSpsGvINxzozPNJT9KRDBaZEyJ SdBQ== 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; bh=joroTlrSceMKAwb1c0bTekIv0qWsOv7pNUmkFt66Ja0=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=p8j/5kZLpJdkI4pwkSA6+8rSlrHWehzsfKVumdK3D6v6/tvPTUypS+Xg8BUdYlBWfW TqJbrlSaQBmTOuWGC46CKpJv/U+weY4zFJXgueicQKkHjjSlIRnwRcG2kfffYNXZPhxq NB3xA2Rko5Ev7aerMxP4LuMre//VuvV3beh6xo02SvG3A+R5co3/gc1Qp233FoCTmumS 13OCzVtg0lkb0UPAB/5sFJfYE1kJQNfn7CuPIL+Lv+KdEzbgLZShhY7qENOxwBLP1T7S TRaBDT/cZqBD+6bKFrp2cbirefdweLTBvGFRnlx4FZu/MzSVASVkV8L2nQWCTG+zd6oy LCNA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id ay18-20020a056a00301200b0068a85532963si6392548pfb.160.2023.09.13.11.35.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:35:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id D24D783F425B; Wed, 13 Sep 2023 07:10:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241527AbjIMOKM (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241353AbjIMOJO (ORCPT ); Wed, 13 Sep 2023 10:09:14 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96E531BD7 for ; Wed, 13 Sep 2023 07:08:52 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8n2A00Q3fvA4V06S8n4C; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ct7-5a; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV65-GX; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 34/52] m68k: mvme16x: Remove unused sink in mvme16x_cons_write() Date: Wed, 13 Sep 2023 16:08:24 +0200 Message-Id: <22c4d1978f811d7f4495eeb269ce06304717627a.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948453116151744 X-GMAIL-MSGID: 1776948453116151744 When building with W=1: arch/m68k/mvme16x/config.c: In function ‘mvme16x_cons_write’: arch/m68k/mvme16x/config.c:211:25: warning: variable ‘sink’ set but not used [-Wunused-but-set-variable] 211 | volatile u_char sink; | ^~~~ Fix this by removing the unused variable and assignment. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/mvme16x/config.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index f00c7aa058dec2f3..b6833862ea6b1530 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -208,7 +208,6 @@ static void __init mvme16x_init_IRQ (void) void mvme16x_cons_write(struct console *co, const char *str, unsigned count) { volatile unsigned char *base_addr = (u_char *)CD2401_ADDR; - volatile u_char sink; u_char ier; int port; u_char do_lf = 0; @@ -229,7 +228,7 @@ void mvme16x_cons_write(struct console *co, const char *str, unsigned count) if (in_8(PCCSCCTICR) & 0x20) { /* We have a Tx int. Acknowledge it */ - sink = in_8(PCCTPIACKR); + in_8(PCCTPIACKR); if ((base_addr[CyLICR] >> 2) == port) { if (i == count) { /* Last char of string is now output */ From patchwork Wed Sep 13 14:08:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138841 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120999vqx; Wed, 13 Sep 2023 07:20:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEhB0gBC1OKsoqC0v6L1US3xqVmaf1DofPJpnGFWlUlNH2hfoQHRfOlbEVVYIY2pQRQJAbJ X-Received: by 2002:a05:6e02:2145:b0:34f:75eb:f81 with SMTP id d5-20020a056e02214500b0034f75eb0f81mr3213609ilv.5.1694614848920; Wed, 13 Sep 2023 07:20:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614848; cv=none; d=google.com; s=arc-20160816; b=oHULu/9RpVp67V60w/cOCmXXyzU8LyWsLvsbdkM7M7py/PkCu/xx6lAbUFKChd3zBv 699SlKsqh7gxuy5Kor7TRLFLRgyZWQsChlheuaxKVp1An1XU71I90pM+Mjw9Huke8d0n wJZ9Ed2qkBM0RS0ozHmH2W/KB10+dJekYKCmtq9equG9ygBtZMauLRpwawpw9RmEjTB4 PI7ac9EMXWN6iZPGsY9I+oN776eT4pZQTv33Hyyu0ORUwiqbbRY9kJ2oEShoVmyN/1Qp Dr2eLykO9QU4NPvf/k8+7MX3zayDoUgt9VwB5av0kjgiKEhM8WyWMttYzSCsLAPvNAWo M8oA== 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; bh=jbz+fBVr3aUkfQwAAbDJ2USPsWaHI+N1HSZm5uCW3jo=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=CiYqPG3Jy45qJ7YDjXu8U+jKydK09bh+CsaL+JCIj6gDgX6LDw0rsINEW1uCQ+r9kv kZyXcnEZCwNMsPYFwLM6k7a9FgSpXoui1Xr+g0yUkaKvlPYqce0b0kYi2j9rb7MwBA2l GZsEDZscCbfLjp/5cNkIggEAqA4OqP7+EdyL4KNXS3Wc5G370r+uUIMqEWjT2jcAXVtJ KnBnYOq5VcUVagCeol67cmVo5aUojHvnhSugPUXcN/Q4pYXtAfNWSguxI/Xe8/i8exE1 AhRyIXL36B2ZPlYGFzeJcqSb/6PlkeRmNMTUihIB/enQd8mGiB4bl+9aj3E8N44h6qMv I8/Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id a35-20020a631a63000000b0056c4189d6d9si9711803pgm.836.2023.09.13.07.20.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id CC80A80C056D; Wed, 13 Sep 2023 07:10:31 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241605AbjIMOKW (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241397AbjIMOJc (ORCPT ); Wed, 13 Sep 2023 10:09:32 -0400 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86C951BFE for ; Wed, 13 Sep 2023 07:08:52 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8n2A00R3fvA4V06S8n4D; Wed, 13 Sep 2023 16:08:48 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctB-6W; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6A-HL; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 35/52] m68k: mvme16x: Add and use "mvme16x.h" Date: Wed, 13 Sep 2023 16:08:25 +0200 Message-Id: <6200cc3b26fad215c4524748af04692e38c5ecd2.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:31 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932459502148136 X-GMAIL-MSGID: 1776932459502148136 When building with W=1: arch/m68k/mvme16x/config.c:208:6: warning: no previous prototype for ‘mvme16x_cons_write’ [-Wmissing-prototypes] 208 | void mvme16x_cons_write(struct console *co, const char *str, unsigned count) | ^~~~~~~~~~~~~~~~~~ Fix this by introducing a new header file "mvme16x.h" for holding the prototypes of functions implemented in arch/m68k/mvme16x/. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/early_printk.c | 4 ++-- arch/m68k/mvme16x/config.c | 2 ++ arch/m68k/mvme16x/mvme16x.h | 6 ++++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 arch/m68k/mvme16x/mvme16x.h diff --git a/arch/m68k/kernel/early_printk.c b/arch/m68k/kernel/early_printk.c index 7d3fe08a48eb0319..3cc944df04f65ef1 100644 --- a/arch/m68k/kernel/early_printk.c +++ b/arch/m68k/kernel/early_printk.c @@ -12,8 +12,8 @@ #include #include -extern void mvme16x_cons_write(struct console *co, - const char *str, unsigned count); + +#include "../mvme16x/mvme16x.h" asmlinkage void __init debug_cons_nputs(const char *s, unsigned n); diff --git a/arch/m68k/mvme16x/config.c b/arch/m68k/mvme16x/config.c index b6833862ea6b1530..9bb9a33e43c246c4 100644 --- a/arch/m68k/mvme16x/config.c +++ b/arch/m68k/mvme16x/config.c @@ -38,6 +38,8 @@ #include #include +#include "mvme16x.h" + extern t_bdid mvme_bdid; static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE; diff --git a/arch/m68k/mvme16x/mvme16x.h b/arch/m68k/mvme16x/mvme16x.h new file mode 100644 index 0000000000000000..159c34b700394116 --- /dev/null +++ b/arch/m68k/mvme16x/mvme16x.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +struct console; + +/* config.c */ +void mvme16x_cons_write(struct console *co, const char *str, unsigned count); From patchwork Wed Sep 13 14:08:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138844 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1121116vqx; Wed, 13 Sep 2023 07:21:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFCUsdOoSTSHFsHSfd+kUm5jDJOSzdUJb4Pf1ljNjwrr+T2yLR+qrQebqArLMeNwpvCogfd X-Received: by 2002:a05:6a00:b54:b0:68f:caaa:e6d5 with SMTP id p20-20020a056a000b5400b0068fcaaae6d5mr3447465pfo.14.1694614860084; Wed, 13 Sep 2023 07:21:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614860; cv=none; d=google.com; s=arc-20160816; b=APK7OQ2Rg6VCMI5VX9zA4DYzv78b57HYRk0GQRCDW2raFy0eUtaH9gkgQr4xecKTlc iD7YDmfVp2a+OkkJRRMAgAdZK5oerDoPUvCVxfDXNhloF7tgAtLdCMgiH7DMRQ96h6ba PjAHbfbINIUb3aO1bq+Q35PwF3VJYkf59tTnT10VZtLNrV9BEvYUkne+NaEXhpAyD+Ln q5Ba3pUfqMtOdY828o0FljX7QmG/XCnjuN/CLsuUnzt4G1o9OsuUdQNH8SrhSoUi8RQj ctuCQSxcE2T8xz6gugRT8OadZGc8U5R6lcnhXkDMUXVtf733BASu1Y0AeuOJRoKP1M7I DR4g== 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; bh=KglRTDF9jdSg4sYf3+Ovc55d8ixMunJ959Rjb349q+I=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=AoS3PYvrMhS8ZaqQ2MmXaZ5PHJP8P/ZdLrtpvuhPRQx+j+cMFaKKCEN20HFXDofSbX cg1gpG66b1WJUsVJQ+WMY7lU/18+tBXUGsZGKWS0UllT1drolLS7QJNhH6zVJYrdOT9I 6W8sQP+MfGzebVAqnguig+i1XEKZwJU+YSGo5LmMEVf0vMYKlXg6jJhkEQdeVnU4ncFv MGbG8xKONF9VpcpAfjOVduv5gjBDGEtGJwsSN00LLVz9qo1o6CWT0fUYy3+HIumx0X1q YryQtE9z4GyqvZ08+jTumPohpEet4q8GLeucaTTIJ9NKstmkkN/gU6BYDL1l5ThO2y2V w0Vw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id j15-20020a633c0f000000b00563e0a0b2e1si9823983pga.451.2023.09.13.07.20.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:21:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 2C00C808D2BD; Wed, 13 Sep 2023 07:10:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241485AbjIMOJ7 (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241331AbjIMOJN (ORCPT ); Wed, 13 Sep 2023 10:09:13 -0400 Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [195.130.132.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8D181BF1 for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG2KJvz4wxgY for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by baptiste.telenet-ops.be with bizsmtp id lS8p2A0063fvA4V01S8prH; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctG-88; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6F-Il; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 36/52] m68k: q40: Add and use "q40.h" Date: Wed, 13 Sep 2023 16:08:26 +0200 Message-Id: <7f983ce079b176e1e1ac2a7d0c35b36197c5fa6b.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:56 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932471291260563 X-GMAIL-MSGID: 1776932471291260563 When building with W=1: arch/m68k/q40/q40ints.c:84:13: warning: no previous prototype for ‘q40_init_IRQ’ [-Wmissing-prototypes] 84 | void __init q40_init_IRQ(void) | ^~~~~~~~~~~~ arch/m68k/q40/q40ints.c:112:6: warning: no previous prototype for ‘q40_mksound’ [-Wmissing-prototypes] 112 | void q40_mksound(unsigned int hz, unsigned int ticks) | ^~~~~~~~~~~ arch/m68k/q40/q40ints.c:152:6: warning: no previous prototype for ‘q40_sched_init’ [-Wmissing-prototypes] 152 | void q40_sched_init (void) | ^~~~~~~~~~~~~~ Fix this by introducing a new header file "q40.h" for holding the prototypes of functions implemented in arch/m68k/q40/. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/q40/config.c | 6 ++---- arch/m68k/q40/q40.h | 6 ++++++ arch/m68k/q40/q40ints.c | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 arch/m68k/q40/q40.h diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index c78ee709b45879c7..2c51c2b4a4fbbf79 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c @@ -36,16 +36,14 @@ #include #include -extern void q40_init_IRQ(void); +#include "q40.h" + static void q40_get_model(char *model); -extern void q40_sched_init(void); static int q40_hwclk(int, struct rtc_time *); static int q40_get_rtc_pll(struct rtc_pll_info *pll); static int q40_set_rtc_pll(struct rtc_pll_info *pll); -extern void q40_mksound(unsigned int /*freq*/, unsigned int /*ticks*/); - static void q40_mem_console_write(struct console *co, const char *b, unsigned int count); diff --git a/arch/m68k/q40/q40.h b/arch/m68k/q40/q40.h new file mode 100644 index 0000000000000000..3146679bde0dab97 --- /dev/null +++ b/arch/m68k/q40/q40.h @@ -0,0 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +/* q40ints.c */ +void q40_init_IRQ(void); +void q40_mksound(unsigned int hz, unsigned int ticks); +void q40_sched_init(void); diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c index 127d7ecdbd49ecd9..10f1f294e91f9705 100644 --- a/arch/m68k/q40/q40ints.c +++ b/arch/m68k/q40/q40ints.c @@ -24,6 +24,8 @@ #include #include +#include "q40.h" + /* * Q40 IRQs are defined as follows: * 3,4,5,6,7,10,11,14,15 : ISA dev IRQs From patchwork Wed Sep 13 14:08:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138811 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1113343vqx; Wed, 13 Sep 2023 07:10:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGM/owiWt3zRZ5M2lPpvnM7V+R2nbY88TOjHeUp0O2bEaQ576Nmu/O4HiM9felP9u4GtBtJ X-Received: by 2002:a17:902:db03:b0:1b8:af5e:853c with SMTP id m3-20020a170902db0300b001b8af5e853cmr3916638plx.26.1694614222853; Wed, 13 Sep 2023 07:10:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614222; cv=none; d=google.com; s=arc-20160816; b=f5dJ2IGtUqRC5NAGpv/Y954/51Ld3xvVXsCJ4HMrLj6E81LvPUbnZTu7FyAgbZlUUB 9uU3umWWMJOkWiLdUSLJfhgzRyy+C7vc5Vnm51UUvSDNR393iNY/Fdnwm/TzhY6WkB3Z tqRfz4oK39+0+d34ScnSDIy/h8a1kUeAzl81bQ5HdVU1PTy56J1Gk6k3g1smdoyqBs2i 4uvlExDmiPKnfNlfOmDlE0jHZfikhpvABQ8GipNN8enWLuOUGzY3keKPx9elXqmxs2SX 68NkUIv9RoliiSxSa3y2qU8yrJqo9KikIG7h2iZelImyddLSQSZQyGsBohCqpCrQu0Qu q7ow== 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; bh=I80zwdN3OfuNZjSmSdEQmVrxxVvr4ycRyySugMnYfEY=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=OtXscb06HA3VUi0SQTrLGABiEW0VftXFfdmN4f6VNLzRLWApI0cZE+8DfF6C/JrG6X H6w3ItCw0a57cuMInXup6ddDBRKQO1fPO683TMHrSRt16d8TU7l59T8UiQScY/EoO8Bl KNeHKcjOCU4dKWeJs3SM8u4wKBGbwu3DLM6MN4FsRaRLDG8Z1gByg3Jy25ZWLkp+pFZn YBSJhOpi0BafPLrvtMMuRQ/KUd5g9gIa9AVvmRkYb9ErRGPfN2WZoNfYUgQZaMbrpoBu /6cJXWhsBwKkUImNymkLTl3TZvXdUkx+F1wgZCbpvkkEVW7A8SmAmrGyfKkCU41WI4s7 S1fA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id n6-20020a170903110600b001b878f9e11csi10672250plh.54.2023.09.13.07.10.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:10:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id AFE5080BB1ED; Wed, 13 Sep 2023 07:10:18 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241394AbjIMOKF (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241347AbjIMOJO (ORCPT ); Wed, 13 Sep 2023 10:09:14 -0400 Received: from riemann.telenet-ops.be (riemann.telenet-ops.be [IPv6:2a02:1800:110:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9239F1FCE for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by riemann.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PH2q0Sz4x20h for ; Wed, 13 Sep 2023 16:08:51 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by xavier.telenet-ops.be with bizsmtp id lS8q2A0021C8whw01S8q3q; Wed, 13 Sep 2023 16:08:51 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctI-8w; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6L-Ja; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 37/52] m68k: sun3/3x: Include for config_sun3*() Date: Wed, 13 Sep 2023 16:08:27 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:18 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931802867451009 X-GMAIL-MSGID: 1776931802867451009 When building with W=1: arch/m68k/sun3/config.c:123:13: warning: no previous prototype for ‘config_sun3’ [-Wmissing-prototypes] 126 | void __init config_sun3(void) | ^~~~~~~~~~~ arch/m68k/sun3x/config.c:42:13: warning: no previous prototype for ‘config_sun3x’ [-Wmissing-prototypes] 42 | void __init config_sun3x(void) | ^~~~~~~~~~~~ Fix this by including Fixes: 91d7b75a5888c182 ("m68k: Add asm/config.h") Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/config.c | 1 + arch/m68k/sun3x/config.c | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 203f428a0344a735..b932250c9e7ffbae 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c @@ -32,6 +32,7 @@ #include #include #include +#include char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index 37121a0f12531fef..3a10cda636fc38fb 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c @@ -19,6 +19,7 @@ #include #include #include +#include #include "time.h" From patchwork Wed Sep 13 14:08:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138853 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1123768vqx; Wed, 13 Sep 2023 07:25:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFS1mUwLo/UwAnN87q1AgbORWXUJk6eFeXhgZNa8HIPNcfulDaKzi7qZJFmaidyEfDmbjqx X-Received: by 2002:a05:6830:c93:b0:6b9:70c9:e1c8 with SMTP id bn19-20020a0568300c9300b006b970c9e1c8mr2666610otb.5.1694615110060; Wed, 13 Sep 2023 07:25:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615110; cv=none; d=google.com; s=arc-20160816; b=l62hWyS0wQJAZ91VdBGkg2a9ZA776D/ApGeNulDtKcTEDrZmOogv2/qooqRs7pa2k+ m6+vbx37Oot/cK/pSrjE7jvaLdnUcYT1NJPsJcZ3+sspE3ePQcvnYjGoivS6+O9lnr2F d50pJn5oeiJVETx4y3AEgJL1g2tiL+eLodavqUKdbaWzb6IvyTGe1Wg6GcJ5WRFgR48r PnKlMNGvJQTqXiXM9vtlZs8PpFGyY9OoWeWY2dXsmbhpOS1Qrg/ImQzyUC10uOXK6UtI 5IinVEZFcdWEnu/PSiciVihMpAPJ+nLid/5aamJUNZvfpkC9qbQYwZ39z1YvIiI5ryiH 19OQ== 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; bh=H9dUecZKfR+BZkOyIuYodLUSzMwUH5DhN4gmv0+eYVw=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=nh0hpk9QUnFCaFYpiwbKMJKWrHGVHkxtFlt7iXhFqQfj1CXgRQQRLPuGtzPUZaM+ky 7cMwZgpbUuXuPmQMOuu1MYz2XV+taUO5jG1qb0dH2BLFaK+gZdPPd5aUi1HvXI+Ud7NY CiNtB9Zzh+xtpCvOQ1iJqg4eFx36VtJW6oCcov2LhppqCJ8i0ssgBJkK26p2o5I1Z5e3 FWpONB9kskhdAYqKcJoVWuVF12Z4d/N+2ouFYll2itykcjtnudB381q2PxUbh6Co48lx DDyaqmRR8wPf9YzEWhK/KCJC+0AdLxPZJ8PSkZqpSpdzbvKU5l+E/wTrMnNA9U2fzDbZ ptVA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id ca26-20020a056a00419a00b0068fa57d2486si5210545pfb.125.2023.09.13.07.25.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:25:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 99A0D845085C; Wed, 13 Sep 2023 07:10:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241688AbjIMOKp (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241456AbjIMOJs (ORCPT ); Wed, 13 Sep 2023 10:09:48 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [IPv6:2a02:1800:120:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 04B202109 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG2qljz4wwdj for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by xavier.telenet-ops.be with bizsmtp id lS8p2A0063fvA4V01S8p3f; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctO-Ag; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6Q-LK; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 38/52] m68k: sun3: Improve Sun3/3x DVMA abstraction in Date: Wed, 13 Sep 2023 16:08:28 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932733326271724 X-GMAIL-MSGID: 1776932733326271724 When building with W=1: arch/m68k/sun3/dvma.c:65:13: warning: no previous prototype for ‘sun3_dvma_init’ [-Wmissing-prototypes] 65 | void __init sun3_dvma_init(void) | ^~~~~~~~~~~~~~ arch/m68k/sun3x/dvma.c:178:6: warning: no previous prototype for ‘dvma_unmap_iommu’ [-Wmissing-prototypes] 179 | void dvma_unmap_iommu(unsigned long baddr, int len) | ^~~~~~~~~~~~~~~~ Fix this by moving the declarations for sun3_dvma_init() and dvma_unmap_iommu() to . Avoid #ifdefs in callers by providing dummy static inline functions. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/include/asm/dvma.h | 8 +++++++- arch/m68k/sun3/sun3dvma.c | 15 --------------- 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/m68k/include/asm/dvma.h b/arch/m68k/include/asm/dvma.h index f609ec1de36d0d2c..d1d66d04844d3e1c 100644 --- a/arch/m68k/include/asm/dvma.h +++ b/arch/m68k/include/asm/dvma.h @@ -58,12 +58,16 @@ extern void dvma_free(void *vaddr); #define dvma_vtob(x) dvma_vtop(x) #define dvma_btov(x) dvma_ptov(x) +void sun3_dvma_init(void); + static inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len) { return 0; } +static inline void dvma_unmap_iommu(unsigned long baddr, int len) { } + #else /* Sun3x */ /* sun3x dvma page support */ @@ -78,9 +82,11 @@ static inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, #define dvma_vtob(x) ((unsigned long)(x) & 0x00ffffff) #define dvma_btov(x) ((unsigned long)(x) | 0xff000000) -extern int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len); +static inline void sun3_dvma_init(void) { } +int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, int len); +void dvma_unmap_iommu(unsigned long baddr, int len); /* everything below this line is specific to dma used for the onboard ESP scsi on sun3x */ diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c index 4b560f4d3960c2b5..f66b2413209069f2 100644 --- a/arch/m68k/sun3/sun3dvma.c +++ b/arch/m68k/sun3/sun3dvma.c @@ -20,18 +20,6 @@ #undef DVMA_DEBUG -#ifdef CONFIG_SUN3X -extern void dvma_unmap_iommu(unsigned long baddr, int len); -#else -static inline void dvma_unmap_iommu(unsigned long a, int b) -{ -} -#endif - -#ifdef CONFIG_SUN3 -extern void sun3_dvma_init(void); -#endif - static unsigned long *iommu_use; #define dvma_index(baddr) ((baddr - DVMA_START) >> DVMA_PAGE_SHIFT) @@ -274,10 +262,7 @@ void __init dvma_init(void) dvma_unmap_iommu(DVMA_START, DVMA_SIZE); -#ifdef CONFIG_SUN3 sun3_dvma_init(); -#endif - } unsigned long dvma_map_align(unsigned long kaddr, int len, int align) From patchwork Wed Sep 13 14:08:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138838 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120776vqx; Wed, 13 Sep 2023 07:20:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENOLI846cNcKTHhPRoiMuobe3zsWNQ0PnL61DB3NvA37HbfsVCI0GnGQoK3Qw/KzPljOuE X-Received: by 2002:a17:903:32d1:b0:1bc:2c58:ad97 with SMTP id i17-20020a17090332d100b001bc2c58ad97mr3367989plr.22.1694614831920; Wed, 13 Sep 2023 07:20:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614831; cv=none; d=google.com; s=arc-20160816; b=yrOLGvbIkmBkhARNbZhgXFDR5PRAcip1JmoCY0UcPM0HVFvy/A7/J8+7d5w7Pc5PG6 BjeUxxrWu/Q3ffqY1jxmq6vYqV06xG4nE/ubDxTecD5Jjopsktr8Lp1msYnMedCjIyJK i4nNr50GgV/QA3HP6tMjyZzuO+t1Yuyms3Vz4ZGZn4RAwiZSTN7ie4ZpiK7Xaxi3eZ5l udbT25472L3c9+3erq/Q4fM1WsF9FghJbk4/kO/5Uosc/T7XOKC1eEaBZa2f2bTlNbAt xhoW5O9u4vg0KnEQO1xuE77zzq08Vk19C9LyyDkX3HBHh42ACJ5PRtiFXEpro7Rn85vQ H8CA== 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; bh=QD/cDVY5gGdk/n8K4ui1pTQHK96PGAClLMstNrzspB0=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=WsOD10O1BLUhQU6gGcsKzbZGNTaWeA99g/3+qMx8IP0Zu7D102qJHv0+nJXBaH9kKx Wu1gKXCXp8FVMcpAG5LtYAoQwzO0/BMsWbea39JjKCplC7J8F/cZgU+GOlefwr6CWwEM /V2XIuYJEfhEzUR8DaT/4wrfZU8/FnpaXegwtvoRrloNOusOVhbMk5sd68S97rAkd9/P HV5NW7eekguiRW90O5jVdILTgD7+ToYhhI3g6Kyb76ZHPHFDCX95eUGF/wipwdvzb2hp aQ8Kr/7JS1WX0afk/vbBYYHpw03RspryjEBhYTkcjWxTQ9q+BB1153Rml3wDMzwxvzCY E+7w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id kb14-20020a170903338e00b001b85ca73574si9927814plb.285.2023.09.13.07.20.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 22B7F804259E; Wed, 13 Sep 2023 07:09:52 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241213AbjIMOJf (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241279AbjIMOI5 (ORCPT ); Wed, 13 Sep 2023 10:08:57 -0400 Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [195.130.137.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF7BA1BE8 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF3F77z4xHC5 for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by albert.telenet-ops.be with bizsmtp id lS8n2A00U1C8whw06S8n4E; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctR-BL; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6V-M7; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 39/52] m68k: sun3: Fix context restore in flush_tlb_range() Date: Wed, 13 Sep 2023 16:08:29 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:53 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932442061532949 X-GMAIL-MSGID: 1776932442061532949 When building with W=1: In file included from arch/m68k/kernel/traps.c:42: arch/m68k/include/asm/tlbflush.h: In function ‘flush_tlb_range’: arch/m68k/include/asm/tlbflush.h:191:28: warning: variable ‘oldctx’ set but not used [-Wunused-but-set-variable] 191 | unsigned char seg, oldctx; | ^~~~~~ Indeed, the old context is saved, but never restored. Fix this by adding the missing call to sun3_put_context(). Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. Compile-tested only. This issue seems to have been present since the introduction of Sun3 support in v2.4.0. --- arch/m68k/include/asm/tlbflush.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/m68k/include/asm/tlbflush.h b/arch/m68k/include/asm/tlbflush.h index b882e2f4f5516f8d..3ab329a03c76c8d8 100644 --- a/arch/m68k/include/asm/tlbflush.h +++ b/arch/m68k/include/asm/tlbflush.h @@ -208,6 +208,7 @@ static inline void flush_tlb_range (struct vm_area_struct *vma, next: start += SUN3_PMEG_SIZE; } + sun3_put_context(oldctx); } static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end) From patchwork Wed Sep 13 14:08:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138851 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1123753vqx; Wed, 13 Sep 2023 07:25:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGhsT9LU7hftO1YCGA8wg4NjsS5SyG+7UyHOntt8OXBczUQoA/jwymzJecrOS46DpFtCnQf X-Received: by 2002:a05:6a20:4410:b0:140:6fa9:7001 with SMTP id ce16-20020a056a20441000b001406fa97001mr3144154pzb.40.1694615108608; Wed, 13 Sep 2023 07:25:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615108; cv=none; d=google.com; s=arc-20160816; b=lenK6yeVtLhix13JQ65cR0uIyPwvgnjCneGBGdL9NysumkasHN2j2h3C/Wo0a6u/Mq SzGzZ3DI1haL+NpUrxaibUtgHrXjGblziTZnP2eCW2gHxZLC0YCNwjGeAn3ab15WyJ8H 9wZrupaGYUOqk82yfSQE7KIOi0JIl11ErxAPf2EkY3BPVnXgomzRuyMyDm2LR5H+Cloc QPqPL02rZ1jh0/JdhwrA3oKH/rboCuYOGnivMQbbXoozULfdBDfEXokIURMC6P4ultUG Xbh9/59JsAc3l6OuAyix8GoVEHMkE/i4B+qBVgtz9drPsgOvjOX1EsrwZ74YOCyygJoz 0/Nw== 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; bh=itvAk7FW3/ARrrlUqmN2UdRT0mPs1snS66nT0mr855M=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=dfu3GpTOCcQyN4IMk4pw3zasCNrNu8EdPbO6n7zKX2kszcOqo+8Hzc03ys5rsJ5vlR kWlaN178Pp2oefHxofH30VxvopUdxt5YNrxfSNQr8X9TW/zITuTXlYSe1yuNTA7RTx/O YayLmD/3awiHb8Xu+O+D9+SXWHzZ8R6DXJXiftkcj5gmUsJt6d22DtwM2e+Ui+MijtT8 irdE3pUEiEFO0naCfIDvysFlbegR8xJoYOPctpRqtyaaWof1vFmxjv/NXj/56taHXvqI 0CU1Kp5FqxhpmbHk2p8bDJ0M+La+vdSFwgvl2UTW/NbsRGkXlFdEpnPdz+1cXnKHbD2+ /PcA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id a11-20020a056a001d0b00b00682a0e45b59si10146096pfx.85.2023.09.13.07.25.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:25:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 373C8844D53C; Wed, 13 Sep 2023 07:10:50 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241449AbjIMOKb (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53044 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241407AbjIMOJc (ORCPT ); Wed, 13 Sep 2023 10:09:32 -0400 Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [IPv6:2a02:1800:110:4::f00:11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1380A1FE0 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF2Pmyz4xHBr for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by baptiste.telenet-ops.be with bizsmtp id lS8n2A00i1C8whw01S8nqN; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctU-C6; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6a-NZ; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 40/52] m68k: sun3: Fix signature of sun3_get_model() Date: Wed, 13 Sep 2023 16:08:30 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:50 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932731953981464 X-GMAIL-MSGID: 1776932731953981464 The mach_get_model() callback takes a "char *", not an "unsigned char *". Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/idprom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/sun3/idprom.c b/arch/m68k/sun3/idprom.c index 1ace5353d78f5377..9ffd6515ad74a7fa 100644 --- a/arch/m68k/sun3/idprom.c +++ b/arch/m68k/sun3/idprom.c @@ -83,7 +83,7 @@ static void __init display_system_type(unsigned char machtype) prom_halt(); } -void sun3_get_model(unsigned char* model) +void sun3_get_model(char *model) { register int i; From patchwork Wed Sep 13 14:08:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138822 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1118760vqx; Wed, 13 Sep 2023 07:17:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFZEJn2n97uUc5m/yVZvxRqiZJHWflo84v6DvGjmk8VbQ3eQwo1DEQA9BBRVyYLi5DagprS X-Received: by 2002:a05:6a00:845:b0:68c:6a77:4845 with SMTP id q5-20020a056a00084500b0068c6a774845mr3314864pfk.12.1694614659744; Wed, 13 Sep 2023 07:17:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614659; cv=none; d=google.com; s=arc-20160816; b=uNYWZ7PzgZ8Qdyqd8OiGf/7aOWIwg9zhHQ+csUxubIyWMFEPzJDardYBuUYoOyAHsx phIOIGT3B2fNd4AeHm2PGls1NZer+edfK91LVtmssMJZEP71WvkUyTNTB/EVwq2z2g1z HDzyDMH+rtc9ulZlgd3L3BRtrinacZNMaeC5ljTWHmZsQ/Tfi+DByoQpNH67ZDzsmMBy RmpQ9zFw3IuYAoN7H+YqTOXLjSVuWHU/g2yEjhy/T/P8NOcW98EfjmLt3eJfD5bKpHes R4KkJqTM20+fJOQQ31pthNHM5v2Fv/z9Y6YDIkKGcqLLXlay/csAKVm14nL8uaIoeBPJ au6g== 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; bh=8N5LaAhRg93tJty48Pc6/5ZiSc/Qs924qvsVcwKmIfk=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=pJ8YnQdIdydaMOc2iaD5KzuXf1PvnhchSTru/AxbxFa6GFpgJDTe89ISJ6tGDN+N41 qqUrgLFFkkpj+yNcT1E4ox4yF+ZkUW65BOk87C/iOI8T6zY72KCX7H1ClyObPiTHvw4a Jfd1smz1PoQWDblyKxPfBsqrjAd7dmlXJBLr2rT6LmI3b8GeW3cRor6VHYXdWKnNTLCD DFPs4leSkIQQd2iSm901aQepBKkLP1240YhaIurOGCCRSQX3tMeNTUpy0bc56ZmayFC3 Mprbx3ynrYoEVyE4vMhOPyN0kYFoeJ+0n01OP0bpIQyU6+hHaDNX9go5x1wPofM/PxiJ 2PBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id t22-20020a639556000000b00573f9a427d2si10267167pgn.53.2023.09.13.07.17.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:17:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 4F826805A58F; Wed, 13 Sep 2023 07:10:48 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241634AbjIMOKf (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241411AbjIMOJc (ORCPT ); Wed, 13 Sep 2023 10:09:32 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [IPv6:2a02:1800:120:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B5F11FEF for ; Wed, 13 Sep 2023 07:08:54 -0700 (PDT) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG3xj9z4x5Yb for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8p2A00R3fvA4V06S8p5B; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003cta-D5; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6f-ON; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 41/52] m68k: sun3: Add missing asmlinkage to sun3_init() Date: Wed, 13 Sep 2023 16:08:31 +0200 Message-Id: <9a174020de2c55e108be9bd25fcdec3e48d655c4.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:48 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932261466091675 X-GMAIL-MSGID: 1776932261466091675 sun3_init() is called from assembly code, so it should be marked asmlinkage for documentation purposes. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/config.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index b932250c9e7ffbae..4550cf25b6f0880a 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include @@ -49,7 +50,7 @@ static void sun3_get_hardware_list(struct seq_file *m) seq_printf(m, "PROM Revision:\t%s\n", romvec->pv_monid); } -void __init sun3_init(void) +asmlinkage void __init sun3_init(void) { unsigned char enable_register; int i; From patchwork Wed Sep 13 14:08:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139191 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp30637vqi; Wed, 13 Sep 2023 17:53:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFVRy5F598XXSLoBeIrYgEjqnKydEePiyhR8DD8vCpqqVRfTx1mLqy0npf1Y0S5xn8cYHAB X-Received: by 2002:a17:902:ce88:b0:1c3:b268:ecba with SMTP id f8-20020a170902ce8800b001c3b268ecbamr576753plg.18.1694652791874; Wed, 13 Sep 2023 17:53:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694652791; cv=none; d=google.com; s=arc-20160816; b=Bdd7f9ihL07clNEEx49QXnVY6cJYuY5qIVPma8CDHsan7F4zJOEKN3z7nPbT2VAb8k U2S/vS2PEuYnuOKZrXhYVaRMdqTDSBX73Xu70PJW5sNjBMBbtnT1wG63HP2TiioAe9r8 R6+csiyIl608uhg6lDlIzuiDoSV9/7l23LC8uxtr31vGN1Exujh7nuIGlNjNySjyuIPs t78faBfaEojds7w+SXbc7qeh3mLjcf2onCqP1Lm4ZQImOiIiMj7vRzsCZmo8kiricZeq 6m4te4oV6QLy3TVOrqfCPtoRpH5HpFXqy+MDK0gn6ZglMOaaAqEIn6Vp5f7XLlDolXNd KnGA== 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; bh=6U9G4+W4pfh/XAZcijax7VQs2PcRt36Z8u5ZyOOlRWM=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=AGxmh8a76CuF0dn4FP0YftePejAm6FDczpknp4gMSikxRPhlDH3wPrq1dK144Rn3X7 I/YCFk6zSSXWl7OjP30eckVwAMw5T4AvIHUOIcHDKmDTbvzjmhthIaP6nkvVTpDmvdat 9Nuo/IRpo+X6OpI9MT4WxsbvXOhmm6VZEBUyGLqHhUaCF77XscrcnKVhes7JDbPaxsq2 1pjy/aT+MoK+l+qQu+tiisDdqSgdnShG7NvE3UsdGavYIzhoYE5E0/2/hV2oz4Hs17v9 xeSjyqdDoP1DRMjeTCVzCkmvnN1yL7YSWWWHGAaUY+xyTXgV1P0SEs3lcZVn5RxrMw/w qiYw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ld3-20020a170902fac300b001bbab2e5a27si448982plb.290.2023.09.13.17.53.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 17:53:11 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 618578031AFB; Wed, 13 Sep 2023 07:11:08 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241516AbjIMOK7 (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53760 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241503AbjIMOKD (ORCPT ); Wed, 13 Sep 2023 10:10:03 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [IPv6:2a02:1800:120:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE2772122 for ; Wed, 13 Sep 2023 07:08:54 -0700 (PDT) Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG44k5z4x7b2 for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8p2A00w3fvA4V01S8pna; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctb-E3; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6j-PH; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 42/52] m68k: sun3: Remove unused orig_baddr in free_baddr() Date: Wed, 13 Sep 2023 16:08:32 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:08 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776972246351319419 X-GMAIL-MSGID: 1776972246351319419 When building with W=1: arch/m68k/sun3/sun3dvma.c: In function ‘free_baddr’: arch/m68k/sun3/sun3dvma.c:208:23: warning: variable ‘orig_baddr’ set but not used [-Wunused-but-set-variable] 196 | unsigned long orig_baddr; | ^~~~~~~~~~ Fix this by removing the unused variable and assignment, which were futile since their introduction in v2.4.5.2. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/sun3dvma.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/m68k/sun3/sun3dvma.c b/arch/m68k/sun3/sun3dvma.c index f66b2413209069f2..6ebf52740ad7c00d 100644 --- a/arch/m68k/sun3/sun3dvma.c +++ b/arch/m68k/sun3/sun3dvma.c @@ -193,9 +193,7 @@ static inline int free_baddr(unsigned long baddr) unsigned long len; struct hole *hole; struct list_head *cur; - unsigned long orig_baddr; - orig_baddr = baddr; len = dvma_entry_use(baddr); dvma_entry_use(baddr) = 0; baddr &= DVMA_PAGE_MASK; From patchwork Wed Sep 13 14:08:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139014 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6510vqb; Wed, 13 Sep 2023 11:34:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEn0Nn4Re68yoBNN6L0++g9e98ALm6LIVX2ET/BNPd23Q+Zhm+48gUORaHTxcLhqsYmqgRI X-Received: by 2002:a05:6a00:1807:b0:68a:6018:a66f with SMTP id y7-20020a056a00180700b0068a6018a66fmr5095248pfa.2.1694630076415; Wed, 13 Sep 2023 11:34:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630076; cv=none; d=google.com; s=arc-20160816; b=VcVfCyxZKDIxLuGEH6mD3jLfkUuUjeI4wB2W1lHdd6+wWK9xr3apjoSja+eVO/E8JX zp8dS2wzF4Q4lk/gKvZoW3KCF2ZVmBsPPk9VS4xda5iGDgZtD+Zpdqh3HJjqJLlKlO1n /V13kpuVeeJ3EAcN51/wcA9sDnVxY9szaMrL1SK3KSxtYTMlsCp4JdZjzD32Y1qz9kiY qHbKUTWRTEPTEYnDkjo2FEQkEvkDmNnvzn70TI+VEjXKJips6MeHSK3wa6L2K2lDNKQN zi3DhQug7c+pjvm4OM1T9gqo19DFCBOY+Ju7VVDojPuEZ2grW4HecGY4RJGPDwP/xZhO 86HQ== 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; bh=wMRIxFSnGsdohm0JDPxFQpFzGbbdxBcizBx7asPyU7c=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=HOObgI5i3KwVT0f+ppOoB28zL9dQh1SybLT029e5yWuaHQI7KmGUBs9a90tf2/roeV 6Jcdr157xgi4N/A27/oLXjeHULvwDryilhAZqfGcGPOPyFEhn3A5kiBom3p2dcP9aZAx 171DjUvOzhi17jI7NYfFr/BqN1metDgHYKx3f9E59jUzsiwT+ixzKCXSq96PvFVZqczA W+U2gA7MDZNzkNRihlCx2RDsXnC0yojNjrYDkUNUY5On3zantwitVjRtkb4UIaDlyvdh herziJkYRloqxnXr1NZ/VcE2YbNqocHyeaIdRsMnUOT6zq3bo4hhvnluYhGi9K/pz0N8 C5Tw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id r10-20020a632b0a000000b0056baff5c55esi10394977pgr.74.2023.09.13.11.34.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:34:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id B46AB83F0297; Wed, 13 Sep 2023 07:10:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241488AbjIMOKC (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241336AbjIMOJN (ORCPT ); Wed, 13 Sep 2023 10:09:13 -0400 Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [195.130.132.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E6E051BF4 for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG4Kgbz4x9kM for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8p2A00y3fvA4V01S8pnd; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003cth-FU; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6o-QF; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 43/52] m68k: sun3: Remove unused start_page in sun3_bootmem_alloc() Date: Wed, 13 Sep 2023 16:08:33 +0200 Message-Id: <361c4562350c8739f6c0da34f7c416b2678fae7c.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948426807341313 X-GMAIL-MSGID: 1776948426807341313 When building with W=1: arch/m68k/sun3/config.c: In function ‘sun3_bootmem_alloc’: arch/m68k/sun3/config.c:110:23: warning: variable ‘start_page’ set but not used [-Wunused-but-set-variable] 112 | unsigned long start_page; | ^~~~~~~~~~ Fix this by removing the variable and the assignment, now the last user is gone. Fixes: 1008a11590b966b4 ("m68k: switch to MEMBLOCK + NO_BOOTMEM") Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/config.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 4550cf25b6f0880a..6e24920e4195490b 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c @@ -109,13 +109,10 @@ static void sun3_halt (void) static void __init sun3_bootmem_alloc(unsigned long memory_start, unsigned long memory_end) { - unsigned long start_page; - /* align start/end to page boundaries */ memory_start = ((memory_start + (PAGE_SIZE-1)) & PAGE_MASK); memory_end = memory_end & PAGE_MASK; - start_page = __pa(memory_start) >> PAGE_SHIFT; max_pfn = num_pages = __pa(memory_end) >> PAGE_SHIFT; high_memory = (void *)memory_end; From patchwork Wed Sep 13 14:08:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138840 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120906vqx; Wed, 13 Sep 2023 07:20:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGEzOcfdr/3NUVqSiFrL4M94cYc2Lalnm4ZSjH44MiQGZg8H3OiCiYxpfmQo8RqB3EI2Lwq X-Received: by 2002:a05:6a00:2387:b0:68e:2879:2eef with SMTP id f7-20020a056a00238700b0068e28792eefmr3143944pfc.24.1694614842648; Wed, 13 Sep 2023 07:20:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614842; cv=none; d=google.com; s=arc-20160816; b=i9Ii5OG3RLyOV/IxYAU4IGh7XDUZ+n+8rO7ImpH3too0EUzsoG1OBvXZz5NJ2GGDNv kzns7dnoxfXJVqJg3v7VNCH3ndFP6u/TAIl+dxvD81ISXLD4vB6by0SB/N/5u7JxklK+ FXyUP88fuwGG7+iAnz+qkQ8bVmYt6oVkjC/q8DuYQzo1Y1PcGsaWMqsuekWZ834QivG/ gdTf3GKxjt8uQuqGn63tyugiW4YI3sqi99LyNKhUPdhFmxyjkhV/l/hu3kjThzUU5BgB cyolk0oe/roi1ArrgN/npktbxQ5QAO+VRfqoJwuuzhHmX94nrM5bv4pt1fVvEGiP1Uzb rBgg== 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; bh=ARP8cyk7eFTqSHh3G0PLn9YBt7bD9at4bYYhrxwoXlQ=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=eRoc6UyG4t4xgKBdnywleS18A72/5VL3qPfjCwOZBq6h/aroqaTQuGVuIT5SA5jdX1 1QMQRMMuLWTT0Ky/8jp+KVYo60S+JSV2xrM1B42XdaYeQIvfOgKM1pRQVKqAZMeOblEW a4ZNyvi6qi5jeien9R3G3bwgOutrM8p/ykHTbkfk5ftOEtkP0sJAjdLRLzSRd9JZkSd0 irO8AmIhnRF8CIuDLnYgaUb0YO+/2DAPue0AkeTogXPoobNqKkZ4EzEYe3Eiac1NziKo y9oxwU/R4DrPkxtwc+5+oWqPNo5fJM5faITMBguDV0vqhC6hobEKgbYIL1DvIuBrxmlk JlQQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id cu12-20020a056a00448c00b0068fe2453ad2si3784502pfb.132.2023.09.13.07.20.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 299908077498; Wed, 13 Sep 2023 07:10:59 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241306AbjIMOKc (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52932 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241410AbjIMOJc (ORCPT ); Wed, 13 Sep 2023 10:09:32 -0400 Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [IPv6:2a02:1800:110:4::f00:11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 353A71FE7 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG4phvz4x0l4 for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8p2A00s3fvA4V06S8p5G; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctl-GT; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6u-RG; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 44/52] m68k: sun3: Remove unused vsprintf() return value in prom_printf() Date: Wed, 13 Sep 2023 16:08:34 +0200 Message-Id: <94a1e61b1651ff05f4a59655d9b8c1ac5338f60c.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:00 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932453090195826 X-GMAIL-MSGID: 1776932453090195826 When building with W=1: arch/m68k/sun3/prom/printf.c: In function ‘prom_printf’: arch/m68k/sun3/prom/printf.c:28:13: warning: variable ‘i’ set but not used [-Wunused-but-set-variable] 28 | int i; | ^ As the return value of vsprintf() is unused, and serves no practical purpose here, fix this by removing the variable. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/prom/printf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/m68k/sun3/prom/printf.c b/arch/m68k/sun3/prom/printf.c index b6724cc6679579bd..db5537ef12504a8b 100644 --- a/arch/m68k/sun3/prom/printf.c +++ b/arch/m68k/sun3/prom/printf.c @@ -25,15 +25,14 @@ prom_printf(char *fmt, ...) { va_list args; char ch, *bptr; - int i; va_start(args, fmt); #ifdef CONFIG_KGDB ppbuf[0] = 'O'; - i = vsprintf(ppbuf + 1, fmt, args) + 1; + vsprintf(ppbuf + 1, fmt, args) + 1; #else - i = vsprintf(ppbuf, fmt, args); + vsprintf(ppbuf, fmt, args); #endif bptr = ppbuf; From patchwork Wed Sep 13 14:08:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138828 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120243vqx; Wed, 13 Sep 2023 07:19:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3UjjoTbLCZdJC19drBqflLUZMKFYeMSa1PwEF216T7KFLwUMJ+swCNohNida9383Cgcgj X-Received: by 2002:a05:6a20:9758:b0:153:860e:47ef with SMTP id hs24-20020a056a20975800b00153860e47efmr2282591pzc.47.1694614787193; Wed, 13 Sep 2023 07:19:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614787; cv=none; d=google.com; s=arc-20160816; b=i0qUVGtg40YAkUedC6aQQj8GN5sVJ2EmqKtcP0i33EwvtsXjdF5UiA/wAtzDUtqIix wHopYW1YBfCWpymE9NtMIXJdiOWYZRsbeaTjeqL2zViUI647HeJAHPapB5gEheRhULox BMSEpWqAWsuFClRoVnNrolarAJaiU6HDz0lULxCel7oj3EreuvWxGq8dKVvK5Wo3bM/z OHHMfwqwJJo0tBsFs5tI5zJBsiBZwLDTPnIDGhESmbUHTxcCO1JsMiAsNIb5gq9Y1aDz dMYzX4V1ZFHuoMENYMxv7S5TleUhBfLTt7c2omCX0RL/LKGnfoRx/QKQpXlNGo6ltIZW C/fg== 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; bh=8zndX+tehjwHI9Wt8FeRvLjBGPn7+WOnr2f7q0CTjs8=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=aAj4/AUywOif6p2+9vJadKuxvI1fUPf1gZK3KBSY88d0IVFD3iaRB34BpctJ2JwHcw Psl4RXGHxExKZb9jYJhj0+P4sLYesCHGWpEEDR3h6lTEKpuy+l4Lr6Lioh2RaawGYxBN VUsBNmVlMEVcoeDV5lK5/lIMSLZY9/0mI7G2rJKjPjI2XyZnITC+qdb0+SabTSfUGFwn PktE1kUMvcrENKvQNznNxlgaxTudxhY36oCnnqPmc7r6Nww7NszDWWXV24p7XTe9/vmp KWXMaG3x/ioMrsKdFa8hWQ46womNtVjEIrsNywvAemIj4XEzPOEBjw50tYXMNYcoNQKg tn+g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id fb14-20020a056a002d8e00b0068ff3a3c9bfsi2715644pfb.8.2023.09.13.07.19.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:19:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 7DF1080C0A5D; Wed, 13 Sep 2023 07:10:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241621AbjIMOK3 (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241398AbjIMOJc (ORCPT ); Wed, 13 Sep 2023 10:09:32 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [IPv6:2a02:1800:120:4::f00:10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86D6D1FC0 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF3XHKz4x7b6 for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by baptiste.telenet-ops.be with bizsmtp id lS8o2A0031C8whw01S8oqP; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctp-HY; Wed, 13 Sep 2023 16:08:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV6y-Sj; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 45/52] m68k: sun3: Annotate prom_printf() with __printf() Date: Wed, 13 Sep 2023 16:08:35 +0200 Message-Id: <61017c012617e6f633ac9f9a3c2659ae38e1f2fb.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:51 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932395176959784 X-GMAIL-MSGID: 1776932395176959784 When building with W=1: arch/m68k/sun3/prom/printf.c: In function ‘prom_printf’: arch/m68k/sun3/prom/printf.c:35:9: warning: function ‘prom_printf’ might be a candidate for ‘gnu_printf’ format attribute [-Wsuggest-attribute=format] 35 | vsprintf(ppbuf, fmt, args); | ^~~~~~~~ Fix this by annotating prom_printf() with __printf(1, 2). Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/include/asm/oplib.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/m68k/include/asm/oplib.h b/arch/m68k/include/asm/oplib.h index 48cb4fd09f8d9cce..6d5ea67c65d044c1 100644 --- a/arch/m68k/include/asm/oplib.h +++ b/arch/m68k/include/asm/oplib.h @@ -9,6 +9,8 @@ #ifndef __SPARC_OPLIB_H #define __SPARC_OPLIB_H +#include + #include /* The master romvec pointer... */ @@ -149,7 +151,7 @@ extern char prom_getchar(void); extern void prom_putchar(char character); /* Prom's internal printf routine, don't use in kernel/boot code. */ -void prom_printf(char *fmt, ...); +__printf(1, 2) void prom_printf(char *fmt, ...); /* Query for input device type */ From patchwork Wed Sep 13 14:08:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120426vqx; Wed, 13 Sep 2023 07:20:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgkeXmVM6lv/4FgaRe3VLaIEK1c+ecLFd4D2mNpXAN97sNJTeMtu/t6Q0AkCnP5DciJZok X-Received: by 2002:a17:903:124f:b0:1b8:83a3:7db6 with SMTP id u15-20020a170903124f00b001b883a37db6mr3442433plh.44.1694614802116; Wed, 13 Sep 2023 07:20:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614802; cv=none; d=google.com; s=arc-20160816; b=PTHMydOWp1CeFxGlb1gGwXJsEZQvqdkYpTNLzeNTJA277KLUUyNkD19OsdD0HPn8nr HcXTZ36auTUwA91OUawqTsGZ3lzi9TolXmtjsmZGgir1PVefYFkZSgsLkLQ+RRMRuD02 ezfD7O4dxxmuzgjx6anHLeRAwAJUEfRLTXzxavhdj6HpGJimpSQsBBB/lKDuGOiwKtNq WFuGdLOE6Jwqwp7FjAEwhCYV36gFWC3453+0OGOHVZfRRQKe0CRIietQkvXhzpx+2dUb ROkUgujKnMuSoEPq90PmLHKg/0NPNXyniKYUSQdOjgZKy8iBrkAURXc+mU3Z8/6Io4Ge QM8w== 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; bh=8teglmiY97ikUsHPPra/qoVTm1cNwhdlUbyWEZowAPw=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=1DKaUOESW0rKlbq3BgmVGC4QbeLU0mRRu5yxiQn3mP8pGpFuDTQ4FAHTjj0GumUzw3 P6udCixrbenU8a0KEtEIkQ9i0/pvu5GnMBJCMcqvkLZiUjA2reDuGN/TqiIoVQRkdgck 2ai+5C0f93yXSBW2nCwQnf5iKQtfgPpDELESMpIFBKG9LKJj+e9c99xMumRdkCEZyZjY lRK3G/TcLeo84OU2iu+wJ7zRIgpTao8yK8oVEO3PzQ4XhQiyEqrmkgMJ2HdATFTNNV/A Lan+VGydQuw5wwi6SUFegiZhUs/9Fz3w2aVhnoTtiIWFurzMi7uBbHBCg1WEBM9kOuFb 8Buw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id b14-20020a170902650e00b001bbcf3bc9d3si10104493plk.384.2023.09.13.07.20.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id C7D6780DB9D3; Wed, 13 Sep 2023 07:11:11 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241693AbjIMOKs (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241295AbjIMOJy (ORCPT ); Wed, 13 Sep 2023 10:09:54 -0400 Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [195.130.137.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 05E01210B for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG4mzlz4wwdb for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by laurent.telenet-ops.be with bizsmtp id lS8p2A0123fvA4V01S8png; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctu-Im; Wed, 13 Sep 2023 16:08:48 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV74-Tr; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 46/52] m68k: sun3: Make print_pte() static Date: Wed, 13 Sep 2023 16:08:36 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:11 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932410813640083 X-GMAIL-MSGID: 1776932410813640083 When building with W=1: arch/m68k/sun3/mmu_emu.c:70:6: warning: no previous prototype for ‘print_pte’ [-Wmissing-prototypes] 70 | void print_pte (pte_t pte) | ^~~~~~~~~ Fix this by making print_pte() static. There was never a user outside arch/m68k/sun3/mmu_emu.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/mmu_emu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c index 7321b3b76283c7c9..7ec9bbf8a3644a10 100644 --- a/arch/m68k/sun3/mmu_emu.c +++ b/arch/m68k/sun3/mmu_emu.c @@ -67,7 +67,7 @@ static unsigned char ctx_avail = CONTEXTS_NUM-1; unsigned long rom_pages[256]; /* Print a PTE value in symbolic form. For debugging. */ -void print_pte (pte_t pte) +static void print_pte(pte_t pte) { #if 0 /* Verbose version. */ From patchwork Wed Sep 13 14:08:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138839 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1120849vqx; Wed, 13 Sep 2023 07:20:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE2Paht+dC1kvuVqC4rETrlmsKOjZbE2i3T86bfDM4Vc3QRD5N6jp9cpet83ENUk9DxpQUX X-Received: by 2002:a17:902:ec8b:b0:1b8:1b79:a78c with SMTP id x11-20020a170902ec8b00b001b81b79a78cmr2695167plg.44.1694614837427; Wed, 13 Sep 2023 07:20:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614837; cv=none; d=google.com; s=arc-20160816; b=ascWr+i87lyClvjVks6QEMl6SDZ4MgmbAgsyCywuOtYzPg+zYr1GR1OVz/OvowPCTf eHjLtu5aeDXY6L1QFnyyfoRZCVg5jRnjBLTeA/XriR2/KiFgWWnu4oTix9y8yvgcOnsV DshOVGCugGKlj3SrZyeK9fogEEC5OSsXa2kEOfWFvXGLaDe0Sh9WLZuwn3bW6519TMBJ h5BZ6ZFzCILJoGPn0ijksy1OP73U/NTfSOLJlbEdvtAQyIW7bPxzp3lAUZnAseCWPXvK RX885JUj5vRrhhY7MKfP+nT/pl4JoRLlkidmNApDRl9DMIPYrzfH7j98yrKSOAuQbkiB YwEQ== 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; bh=5WYdqYwdyIYcIoAilq1L8mmgiB1ICW5Qu9iJswJHOkk=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=RX/MsY3E2D8fqO/Dr7hz8nDyEtSFoq1KvbU2Rjhuzsuq6CfSA7DQW8OXN6CWs4S9sv +G/grO2QfaBVi5C2cVGNbVk5TUZ52DEmKOrGVAW01juMlyW44UqXdXUnXBs7sczdeWqC UelTLqsLZlBgdYDkWF0tR7yF00u/y7yPL3ZtRczOOe0zfBUsYQhwEH5ODPEiKEMcppGR x6Gs939hIXBM+Xf7cgUlqE2Z+FQRQyUVPGXtmA9F13UpJjYjPzp8XwZ2R/ymnXyb0aNb iXioVhPRTMx6/xYwQrmGmtM8Gz9qDCUyjyuzxD9JWix2UUeFaYKzcrQmW4cA9biY6bHc M8Ew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id x10-20020a170902ec8a00b001b9e82a6beesi10279718plg.548.2023.09.13.07.20.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:20:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 211B68087267; Wed, 13 Sep 2023 07:11:20 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241720AbjIMOLC (ORCPT + 36 others); Wed, 13 Sep 2023 10:11:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241505AbjIMOKD (ORCPT ); Wed, 13 Sep 2023 10:10:03 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [195.130.132.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CE5F52123 for ; Wed, 13 Sep 2023 07:08:54 -0700 (PDT) Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PG4Tz4z4x7bC for ; Wed, 13 Sep 2023 16:08:50 +0200 (CEST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:f674:9611:cd05:f25a]) by albert.telenet-ops.be with bizsmtp id lS8p2A00z3fvA4V06S8p5R; Wed, 13 Sep 2023 16:08:50 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003ctx-Ja; Wed, 13 Sep 2023 16:08:48 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV79-Uq; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 47/52] m68k: sun3: Make sun3_platform_init() static Date: Wed, 13 Sep 2023 16:08:37 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:20 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932447751701458 X-GMAIL-MSGID: 1776932447751701458 When building with W=1: arch/m68k/sun3/config.c:201:12: warning: no previous prototype for ‘sun3_platform_init’ [-Wmissing-prototypes] 202 | int __init sun3_platform_init(void) | ^~~~~~~~~~~~~~~~~~ Fix this by making sun3_platform_init() static. There was never a user outside arch/m68k/sun3/config.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 6e24920e4195490b..40796c3e84400def 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c @@ -199,7 +199,7 @@ static const struct resource sun3_scsi_rsrc[] __initconst = { }, }; -int __init sun3_platform_init(void) +static int __init sun3_platform_init(void) { switch (idprom->id_machtype) { case SM_SUN3 | SM_3_160: From patchwork Wed Sep 13 14:08:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138820 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1117503vqx; Wed, 13 Sep 2023 07:15:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF0LE8M3zmfv2HtIMtUoo+Ph4kNS4youSmeKYe1noHtdEUco+SeFVNMpkUmq3X7uyBRsY+2 X-Received: by 2002:a05:6a20:748d:b0:14b:f78e:d061 with SMTP id p13-20020a056a20748d00b0014bf78ed061mr3747566pzd.19.1694614558260; Wed, 13 Sep 2023 07:15:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614558; cv=none; d=google.com; s=arc-20160816; b=z32XNkHgi7AXQDD7ZA5y7tTDfPGk7jN/w0ZuPwJigSD6b4Xx0ym8Ey6DreTxq2IdFC Wy7SxEqTQPZlQncd8ztMEriMVE2KVCCr5Z4ZceFsZ25wzCfv4EJlsr7QokzJ974mvhgB 9bbgqN1HWLFu9oy1kCiCm+eB2pm+AFmZHrPQ5zjklPx3Xh+tgc8/MyypsJ6GchNHydv9 g+lCELYFKPxCTSrFltPnMxKblQhbLmRDbAN7lbRL1ajsktaVaEMjq3h/Wqb0/FK7MeqZ UoNbqhsPvwb8Vm2O2oyuBnKlV9YCs4oiEXMY3QHl3wg8lZZoJxZYGKGvC0Vy59IwH6Xe CGFQ== 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; bh=aG5rpYNSso8mH2Pngbvq1b45iooYjRYdeutoqkMfMvM=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=J/f9CZdmbUYw6bea3cAwFgcG4JS4l9emN8ebo0mi4pI4cJakcKinR3q898aFHAzbgk ckhi/9traC0HUHQwqgUk4OlajfpGPjyOAZ1zI6CgNPgofQXu1N9Qp3S2ooSkCp8R5CJe aFqJ97DY2QAJ7Rs0jk4B/34oripNsCPYuaq8VN+DBc9apI3DC0hWmapjHd+LQ7bXQqLg 3W7QVrjjFwCJ+e11t/O+xA/nv5JgdfGrto0HupOo+lgDMlmCMtgID/xYDhI60t4z4+Kf /9GTp0sSM1dEL+48zbldbuwXtcI2AqZOX7czyTW3L/VjTrY1fQpmDa7/OkuKiQn+lQfz OTQw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id u76-20020a62794f000000b0068fee0e95c5si2901168pfc.89.2023.09.13.07.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:15:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 011CD80BE876; Wed, 13 Sep 2023 07:11:13 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241642AbjIMOKg (ORCPT + 36 others); Wed, 13 Sep 2023 10:10:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241412AbjIMOJd (ORCPT ); Wed, 13 Sep 2023 10:09:33 -0400 Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [IPv6:2a02:1800:120:4::f00:11]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3B7A21FF0 for ; Wed, 13 Sep 2023 07:08:53 -0700 (PDT) Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF466jz4x9kZ for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by andre.telenet-ops.be with bizsmtp id lS8o2A00B1C8whw01S8oWt; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003cu0-KU; Wed, 13 Sep 2023 16:08:48 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXv-00FV7E-W3; Wed, 13 Sep 2023 16:08:47 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 48/52] m68k: sun3x: Fix signature of sun3_leds() Date: Wed, 13 Sep 2023 16:08:38 +0200 Message-Id: <5214afb67eac58b8adae5710aea0980c2644ff24.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:11:13 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932155191787163 X-GMAIL-MSGID: 1776932155191787163 The sun3_leds() implementation for Sun3 in arch/m68k/sun3/leds.c, and the prototype in arch/m68k/sun3/sun3ints.c take an "unsigned char", not an "int". Align the dummy implementation for Sun3x with the Sun3 variant and the common caller. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3x/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index 3a10cda636fc38fb..e2a5d84df6d214d1 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c @@ -27,7 +27,7 @@ volatile char *clock_va; extern void sun3_get_model(char *model); -void sun3_leds(unsigned int i) +void sun3_leds(unsigned char byte) { } From patchwork Wed Sep 13 14:08:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139016 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6553vqb; Wed, 13 Sep 2023 11:34:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFxr/AqeCTusw/MsVdyP7OPK1UTQGsCbe6gNcyDVjFlq6KdIqYoooNrzK4XvN2P4GqPO48F X-Received: by 2002:a17:902:c24d:b0:1bb:e71f:793c with SMTP id 13-20020a170902c24d00b001bbe71f793cmr3396540plg.44.1694630080440; Wed, 13 Sep 2023 11:34:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630080; cv=none; d=google.com; s=arc-20160816; b=Owx/GQrTh+qyrzyn5U+9F0Bj5qZNP89CNwXkRyO98U7trtd1ysFMn4jbVCuuLVjYOh Xz5Ae8C3JlKXM4PXGIjgefShC2TUBbRzIwxuHdZy34MsFY2LiifN7qXnAU3Fph6rsxwS lq+5/IRxRMOahE0ydeBIjBF3TQQE1BJi6B4UJk1bpjUKzVfMpMDyJBXCgGT9M+NK+ojE /z48BEzIntph91CzX4Sur/H4YgGFGpEfDr73J5RsSbKO00ErqghvacTupHnJ60yZCJNP dkTZYMvTURoUWpUYA9GZXC4M0FPsdvTC4cqyM3dg81Z23u4z/oIWHTXc/I2hv6f/J9z6 xKKQ== 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; bh=gTucsyRy5JdKg7qq4cMx/KndPKsszAVPqsfngV+Dlqw=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=VHm976Zu13dzB/9FOIeAUcQC1yxcKoQsCxQLy3Ru5dq3QAHSLD3cliAeaCCnCE+EXw HbEGAlO8nBCzKfqZ7Yovk3+n5ZWElcJpvI3xde4SfoyKbO7CvF0TaXbOZ93/g9EnZOPl 0ADjxSOG3DVDpUdV3tIOJ123c/3x2yuytGm3A5Lt2vjtzh7qM9LKNqBlhFEo7x3PVSyc SDOKtXRcBiFrOzoWs629qNVCBYA4eK+2NGNjXXB5KQSufydGSpiqNIokjLZMFBIH/zZf 2hmw4MLQGsDUcgFoQdzsB4szCFaCRKjraVVdUyE1DwqdVsDNH4kCKtr3bXHlUrN7bL5v r0EQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id l14-20020a170903244e00b001c2109a8576si2339973pls.652.2023.09.13.11.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:34:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id 59AEE83EB319; Wed, 13 Sep 2023 07:09:43 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241396AbjIMOJc (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241245AbjIMOI4 (ORCPT ); Wed, 13 Sep 2023 10:08:56 -0400 Received: from weierstrass.telenet-ops.be (weierstrass.telenet-ops.be [195.130.137.81]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BD3C91BE6 for ; Wed, 13 Sep 2023 07:08:50 -0700 (PDT) Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by weierstrass.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF4dS7z4xHCF for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by baptiste.telenet-ops.be with bizsmtp id lS8o2A0061C8whw01S8oqQ; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003cu3-LI; Wed, 13 Sep 2023 16:08:48 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXw-00FV7J-0e; Wed, 13 Sep 2023 16:08:48 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 49/52] m68k: sun3x: Do not mark dvma_map_iommu() inline Date: Wed, 13 Sep 2023 16:08:39 +0200 Message-Id: <0884fd1f5d6775535bf20b13cc74283df4955e49.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:43 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948431266250796 X-GMAIL-MSGID: 1776948431266250796 dvma_map_iommu() is called from the common Sun3/3x DVMA management code, but never from inside arch/m68k/sun3x/dvma.c. Hence it does not make sense to mark it inline. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3x/dvma.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c index a6034ba058454642..d1847bfa136791e2 100644 --- a/arch/m68k/sun3x/dvma.c +++ b/arch/m68k/sun3x/dvma.c @@ -143,8 +143,7 @@ inline int dvma_map_cpu(unsigned long kaddr, } -inline int dvma_map_iommu(unsigned long kaddr, unsigned long baddr, - int len) +int dvma_map_iommu(unsigned long kaddr, unsigned long baddr, int len) { unsigned long end, index; From patchwork Wed Sep 13 14:08:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138809 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1113174vqx; Wed, 13 Sep 2023 07:10:13 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGPH/WrQUG0QGivtKn3gcJ8KtBNPavkY6m2/HB/LjqduM/jGnNRpe/XB3sdXa1bKM2+CG/u X-Received: by 2002:a05:6a20:561a:b0:147:d861:50e4 with SMTP id ir26-20020a056a20561a00b00147d86150e4mr2095871pzc.33.1694614212781; Wed, 13 Sep 2023 07:10:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694614212; cv=none; d=google.com; s=arc-20160816; b=xF2mYTGZVv9cRxf5ESyDzGNSDmPPicP1c6t+SJpr3JZmgkXJVUzkEL47ztSmThb5Sr y+zAbnriE93jUc0vXuFAJWX0cGF/n09YhHK+BYXy34n039Jpo0JKQxYpXCT0Nz2dqipJ ZMV4gYeaAxtYfDQlRtGi/kaCvruRtZ5ZsSccvyoy64Q3u7/LvfYprLAZPgAGnbpfoFGS DCZnUjbBgzbkLMLHX5dJxSMQSYqiJy2JBumYFJC/dkJxrBmptdTV6geMMy4md2a+UYfD Dp6mpnvEiex4nGuEiwxUkedfAlbL4x7OEzHL5RefJ+Dxibujvpfy/ZQaDHbKitWgBvNL 38sQ== 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; bh=YuUlLWbrpDlVmb+TvtYktklHHmi23pRlagkQ3xRvBUw=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=rbyXRm/UyXJh+8Z59Ow0ZMFo9HlvW1EuytB9kQGXxYu/uPnpj3da+9HU0m5zMXtdIB TyUu42y1LjzmrjgAQ2L6wJoGXl1ZiunQ2tanoIkQMj6wGEtkgjPTp7N9YUoEILO/rfQy WcTJ0dVqkEzBNDlh/rPiyBR/y9MpfNKY96cXuOkcLdxk/X0CRrjdQquvyDr1fcqkh36m K2t8KWwUCFL/cqEaOW2bOFp63QKEZUT59RmIRWaqILAvpLNvkqTAJtumxqWyVQajP+IK IsiVwGYvrNlg3hHErud25E5ymTRrJAbOwF0ZTxWtvGJ0e7YOGR1RyqssXTPVLn8peL7y KF1w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from fry.vger.email (fry.vger.email. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id s16-20020a056a00195000b0068fcff1dc3asi4923905pfk.339.2023.09.13.07.10.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:10:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id BD4CD80BB1E5; Wed, 13 Sep 2023 07:10:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241286AbjIMOJg (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53012 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241283AbjIMOI5 (ORCPT ); Wed, 13 Sep 2023 10:08:57 -0400 Received: from gauss.telenet-ops.be (gauss.telenet-ops.be [195.130.132.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10D7319BF for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by gauss.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF51n0z4x9kf for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by andre.telenet-ops.be with bizsmtp id lS8o2A00D1C8whw01S8oWu; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003cuA-MK; Wed, 13 Sep 2023 16:08:48 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXw-00FV7N-1W; Wed, 13 Sep 2023 16:08:48 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 50/52] m68k: sun3x: Make sun3x_halt() static Date: Wed, 13 Sep 2023 16:08:40 +0200 Message-Id: <0ba2883aaff2e4fc5e570bfee87c58e483668b26.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:07 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776931792775319087 X-GMAIL-MSGID: 1776931792775319087 When building with W=1: arch/m68k/sun3x/prom.c:33:6: warning: no previous prototype for ‘sun3x_halt’ [-Wmissing-prototypes] 33 | void sun3x_halt(void) | ^~~~~~~~~~ Fix this by making sun3x_halt() static. The function body was moved to arch/m68k/sun3x/prom.c in v2.4.5.2. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3x/prom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/sun3x/prom.c b/arch/m68k/sun3x/prom.c index 64c23bfaa90c5ba9..8ac87d3dc60718d9 100644 --- a/arch/m68k/sun3x/prom.c +++ b/arch/m68k/sun3x/prom.c @@ -30,7 +30,7 @@ struct linux_romvec *romvec; e_vector *sun3x_prom_vbr; /* Handle returning to the prom */ -void sun3x_halt(void) +static void sun3x_halt(void) { unsigned long flags; From patchwork Wed Sep 13 14:08:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 139017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:a8d:b0:3f2:4152:657d with SMTP id gr13csp6557vqb; Wed, 13 Sep 2023 11:34:40 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGw1kgdNH/N/6EofKiqQg4851IxeDpjqfLIDwN2pxmQMSwSBAxwolJ/LhUag3FrIGMjMxg9 X-Received: by 2002:a17:903:11d1:b0:1bf:7d3b:4405 with SMTP id q17-20020a17090311d100b001bf7d3b4405mr3777179plh.14.1694630080692; Wed, 13 Sep 2023 11:34:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694630080; cv=none; d=google.com; s=arc-20160816; b=ENy3R2x5B1dZQ2OhPODVb7rdmF16Ky7aMIzfMpFU8ITJ6JbyDRo/4JT4ULwOUaZ2qm kdTi8WM9f0mP6nm3gzu7AwVGWYlm++o3zcYwCJGVesnN6qsL52KIFlzqlueJbLUOAnxB hz//WMHSPn3Ro9i4RT1zoI74qYnUvIkHYQZ1WY2mkaW8w2KDDHPXhjOdyabnkX0rXSnH kQxKlTx+qSErEEYsPV//il/DqFnKJFg73sjcwxFiyKFGaXaqHkFU/3yx72y9H2mJqq+R 0py5noqGKWxFyXTVXfcJ/qCmFo7+wZuzYGFN+DMBg7Yz1q2Z3JuHLs72jhIW9q2acYrZ DBAA== 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; bh=YP/rEIma1PGrCYP/teTCFNt+thd9kKUMYsMsl4JMRkI=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=vl6GSWsAIYvBazL/33VIzBqu18BVZ0R8LfX4hifMybIEsxfkmK0UyIqE21juQnJ3M6 vncMc6t2bG2YzLfSmevlnPH6NdsqCq3CwK0z2JmVsxBCXQHQvoC/CGJWK1Nsy7G0hZUo QxH26ioQLYXZWaNrDE8DBm6+C5DVDG5aXPHAx+9Qs9tvWtuneq5mR58sAsF9JMIDUxbl OCjaZ3CRGy+vBzFJX3zBLt33O/rWpMcJpmGxI/sjWg0KSRN2RU/2EtXjlwSO5DqH7Jxg krEt1UU2j236qyFj15pkBbWJ5je+ryHk5wx+Ez0pc61w77zQTJtws59gd7FyCA3gIWxl YELg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id kb14-20020a170903338e00b001b8c4168e20si10380221plb.58.2023.09.13.11.34.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 11:34:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id EB71883EE9EC; Wed, 13 Sep 2023 07:09:56 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241441AbjIMOJq (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241289AbjIMOI5 (ORCPT ); Wed, 13 Sep 2023 10:08:57 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [195.130.132.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8552F1BCA for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from andre.telenet-ops.be (andre.telenet-ops.be [IPv6:2a02:1800:120:4::f00:15]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF4wWYz4x7bB for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by andre.telenet-ops.be with bizsmtp id lS8o2A00F1C8whw01S8oWv; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003cuC-N6; Wed, 13 Sep 2023 16:08:48 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXw-00FV7S-2V; Wed, 13 Sep 2023 16:08:48 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 51/52] m68k: sun3x: Make dvma_print() static Date: Wed, 13 Sep 2023 16:08:41 +0200 Message-Id: <0a038ac68ee553b1928a975dc0ae1c16803a0ac0.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:09:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776948431813190631 X-GMAIL-MSGID: 1776948431813190631 There was never a user of dvma_print() outside arch/m68k/sun3x/dvma.c. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/sun3x/dvma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/m68k/sun3x/dvma.c b/arch/m68k/sun3x/dvma.c index d1847bfa136791e2..5185b4818d408e71 100644 --- a/arch/m68k/sun3x/dvma.c +++ b/arch/m68k/sun3x/dvma.c @@ -60,7 +60,7 @@ static volatile unsigned long *iommu_pte = (unsigned long *)SUN3X_IOMMU; #ifdef DEBUG /* code to print out a dvma mapping for debugging purposes */ -void dvma_print (unsigned long dvma_addr) +static void dvma_print (unsigned long dvma_addr) { unsigned long index; From patchwork Wed Sep 13 14:08:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 138857 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1124566vqx; Wed, 13 Sep 2023 07:26:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IENOt7GE00kn3tICflIIgg+hkcRFqQNNdUJJiFdPN4Hfe4w2RqvovduX8Heb3RyK5XVNU+p X-Received: by 2002:a17:903:1c5:b0:1bb:55be:e198 with SMTP id e5-20020a17090301c500b001bb55bee198mr3741124plh.0.1694615186710; Wed, 13 Sep 2023 07:26:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694615186; cv=none; d=google.com; s=arc-20160816; b=TllhQSkYNL7j8lvRc74N2iXrednZWTiOXP7A526GU3/YK/55a0KoECGiPOrqu+i1z4 sX3gyxW/MaqHjq+Yo9meSGNnw5X4jvI6axW2hPf1XJRPKMx3hj9MvvllUWiITvwVLZLl YaNkU5Zjzo34Uxvodn3tjPDN9rPq2/89+qkilo/KpvtBwZo+mh3h1nLI4pWtLyi/wAzB j32NiyWkkPDH+FjTm8PCbEYNsCDgNpFuyOpVvd0XcQHnFYyn3KyGRnU4PYpSOp0VYRis Irjn6sV5kl/Dn93If5K77SA01KyihipHwr8K+9/o2p1ozlai86PnueQME5i3Sz1dCgey atFw== 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; bh=NEgmKPVMcdsVIKhxU92cGtTsKixT2ikzXsKZrRod/YA=; fh=fKMC3BTGjlLXl5EvEhzqt3WHCynqYJKK7wAqLAOkWUw=; b=tNGoS3qmAqK6BtnnWUJiwNoxGyvEslHxCvzxVkEYXhFGYKZQT14LL0lFMNzNl4Rz9s aGcB0GNLfeemGGB+uDz43TU+VcObByUFlcEX/YtPJ8FAxK1ygIqB6+WNl8aiiT1zsHxJ m3eWu26/YxNgCbhUR0t/UwAICAtJlpgwegH3+P0L0Kb2KCzJgKLi5rawPIC+axabQRUw J5rCnfEar58Q4gxBgMo2fh2ICOYaN4Mwy8fkzkdW02mt2Com/7hNYfUsJ2RAxBZ/neFQ yLprd4p5yuhKN9BgGtYr/R+OIgQlZbSWdXye370wwRsNkJQeaW6E/dT4hl2C65KJpKar EQqA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id j17-20020a170902da9100b001c1f373ea07si10744149plx.351.2023.09.13.07.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:26:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id A9486806E3FA; Wed, 13 Sep 2023 07:10:30 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239563AbjIMOJm (ORCPT + 36 others); Wed, 13 Sep 2023 10:09:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241290AbjIMOI5 (ORCPT ); Wed, 13 Sep 2023 10:08:57 -0400 Received: from cantor.telenet-ops.be (cantor.telenet-ops.be [195.130.132.48]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 854451BC9 for ; Wed, 13 Sep 2023 07:08:51 -0700 (PDT) Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by cantor.telenet-ops.be (Postfix) with ESMTPS id 4Rm2PF56Qjz4x7bD for ; Wed, 13 Sep 2023 16:08:49 +0200 (CEST) Received: from ramsan.of.borg ([84.195.187.55]) by laurent.telenet-ops.be with bizsmtp id lS8o2A00D1C8whw01S8omP; Wed, 13 Sep 2023 16:08:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qgQXe-003cuH-Os; Wed, 13 Sep 2023 16:08:48 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qgQXw-00FV7X-3J; Wed, 13 Sep 2023 16:08:48 +0200 From: Geert Uytterhoeven To: linux-m68k@lists.linux-m68k.org Cc: Arnd Bergmann , Finn Thain , Michael Schmitz , Philip Blundell , Greg Ungerer , Joshua Thompson , Sam Creasey , Laurent Vivier , linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 52/52] m68k: sun3/3x: Add and use "sun3.h" Date: Wed, 13 Sep 2023 16:08:42 +0200 Message-Id: <87856ef9ef8955f459fb691faca921c0a688bc80.1694613528.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 13 Sep 2023 07:10:30 -0700 (PDT) X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776932813912981607 X-GMAIL-MSGID: 1776932813912981607 When building with W=1: arch/m68k/sun3/idprom.c:86:6: warning: no previous prototype for ‘sun3_get_model’ [-Wmissing-prototypes] 86 | void sun3_get_model(char *model) | ^~~~~~~~~~~~~~ arch/m68k/sun3/config.c:53:24: warning: no previous prototype for ‘sun3_init’ [-Wmissing-prototypes] 53 | asmlinkage void __init sun3_init(void) | ^~~~~~~~~ arch/m68k/sun3/mmu_emu.c:117:6: warning: no previous prototype for ‘print_pte_vaddr’ [-Wmissing-prototypes] 117 | void print_pte_vaddr (unsigned long vaddr) | ^~~~~~~~~~~~~~~ arch/m68k/sun3/mmu_emu.c:126:13: warning: no previous prototype for ‘mmu_emu_init’ [-Wmissing-prototypes] 126 | void __init mmu_emu_init(unsigned long bootmem_end) | ^~~~~~~~~~~~ arch/m68k/sun3/mmu_emu.c:353:5: warning: no previous prototype for ‘mmu_emu_handle_fault’ [-Wmissing-prototypes] 353 | int mmu_emu_handle_fault (unsigned long vaddr, int read_flag, int kernel_fault) | ^~~~~~~~~~~~~~~~~~~~ arch/m68k/sun3/leds.c:6:6: warning: no previous prototype for ‘sun3_leds’ [-Wmissing-prototypes] 6 | void sun3_leds(unsigned char byte) | ^~~~~~~~~ arch/m68k/sun3/intersil.c:27:5: warning: no previous prototype for ‘sun3_hwclk’ [-Wmissing-prototypes] 27 | int sun3_hwclk(int set, struct rtc_time *t) | ^~~~~~~~~~ arch/m68k/sun3x/config.c:30:6: warning: no previous prototype for ‘sun3_leds’ [-Wmissing-prototypes] 30 | void sun3_leds(unsigned char byte) | ^~~~~~~~~ Fix this by introducing a new header file "sun3.h" for holding the prototypes of functions implemented in arch/m68k/sun3/ and arch/m68k/sun3x/. Signed-off-by: Geert Uytterhoeven Acked-by: Arnd Bergmann --- v2: - Add Acked-by. --- arch/m68k/kernel/traps.c | 2 +- arch/m68k/mm/sun3kmap.c | 6 ++---- arch/m68k/mm/sun3mmu.c | 2 +- arch/m68k/sun3/config.c | 4 ++-- arch/m68k/sun3/idprom.c | 2 ++ arch/m68k/sun3/intersil.c | 1 + arch/m68k/sun3/leds.c | 2 ++ arch/m68k/sun3/mmu_emu.c | 1 + arch/m68k/sun3/sun3.h | 22 ++++++++++++++++++++++ arch/m68k/sun3/sun3ints.c | 2 +- arch/m68k/sun3x/config.c | 3 +-- 11 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 arch/m68k/sun3/sun3.h diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index 129c89349e1a40aa..8ee773d29954921c 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c @@ -364,7 +364,7 @@ static inline void access_error040(struct frame *fp) #if defined(CONFIG_SUN3) #include -extern int mmu_emu_handle_fault (unsigned long, int, int); +#include "../sun3/sun3.h" /* sun3 version of bus_error030 */ diff --git a/arch/m68k/mm/sun3kmap.c b/arch/m68k/mm/sun3kmap.c index 4f2a7ef8348bc1a6..ac091892d82f8a06 100644 --- a/arch/m68k/mm/sun3kmap.c +++ b/arch/m68k/mm/sun3kmap.c @@ -18,11 +18,9 @@ #include #include -#undef SUN3_KMAP_DEBUG +#include "../sun3/sun3.h" -#ifdef SUN3_KMAP_DEBUG -extern void print_pte_vaddr(unsigned long vaddr); -#endif +#undef SUN3_KMAP_DEBUG extern void mmu_emu_map_pmeg (int context, int vaddr); diff --git a/arch/m68k/mm/sun3mmu.c b/arch/m68k/mm/sun3mmu.c index c5e6a23e0262128d..494739c1783e4dea 100644 --- a/arch/m68k/mm/sun3mmu.c +++ b/arch/m68k/mm/sun3mmu.c @@ -24,7 +24,7 @@ #include #include -extern void mmu_emu_init (unsigned long bootmem_end); +#include "../sun3/sun3.h" const char bad_pmd_string[] = "Bad pmd in pte_alloc: %08lx\n"; diff --git a/arch/m68k/sun3/config.c b/arch/m68k/sun3/config.c index 40796c3e84400def..cd8af809e0cad1e4 100644 --- a/arch/m68k/sun3/config.c +++ b/arch/m68k/sun3/config.c @@ -35,11 +35,11 @@ #include #include +#include "sun3.h" + char sun3_reserved_pmeg[SUN3_PMEGS_NUM]; static void sun3_sched_init(void); -extern void sun3_get_model (char* model); -extern int sun3_hwclk(int set, struct rtc_time *t); volatile char* clock_va; extern unsigned long availmem; diff --git a/arch/m68k/sun3/idprom.c b/arch/m68k/sun3/idprom.c index 9ffd6515ad74a7fa..ca633a5f5eb1281a 100644 --- a/arch/m68k/sun3/idprom.c +++ b/arch/m68k/sun3/idprom.c @@ -17,6 +17,8 @@ #include #include /* Fun with Sun released architectures. */ +#include "sun3.h" + struct idprom *idprom; EXPORT_SYMBOL(idprom); diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c index 8fc74864de81962b..29674cfa9bb3aa35 100644 --- a/arch/m68k/sun3/intersil.c +++ b/arch/m68k/sun3/intersil.c @@ -17,6 +17,7 @@ #include #include +#include "sun3.h" /* bits to set for start/run of the intersil */ #define STOP_VAL (INTERSIL_STOP | INTERSIL_INT_ENABLE | INTERSIL_24H_MODE) diff --git a/arch/m68k/sun3/leds.c b/arch/m68k/sun3/leds.c index 7c67b58ebf13fa4a..4bb95318fd548302 100644 --- a/arch/m68k/sun3/leds.c +++ b/arch/m68k/sun3/leds.c @@ -3,6 +3,8 @@ #include #include +#include "sun3.h" + void sun3_leds(unsigned char byte) { unsigned char dfc; diff --git a/arch/m68k/sun3/mmu_emu.c b/arch/m68k/sun3/mmu_emu.c index 7ec9bbf8a3644a10..e5a92da43d1978df 100644 --- a/arch/m68k/sun3/mmu_emu.c +++ b/arch/m68k/sun3/mmu_emu.c @@ -27,6 +27,7 @@ #include #include +#include "sun3.h" #undef DEBUG_MMU_EMU #define DEBUG_PROM_MAPS diff --git a/arch/m68k/sun3/sun3.h b/arch/m68k/sun3/sun3.h new file mode 100644 index 0000000000000000..8d98c0aaedc0c686 --- /dev/null +++ b/arch/m68k/sun3/sun3.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#include + +struct rtc_time; + +/* config.c */ +asmlinkage void sun3_init(void); + +/* idprom.c */ +void sun3_get_model(char *model); + +/* intersil.c */ +int sun3_hwclk(int set, struct rtc_time *t); + +/* leds.c */ +void sun3_leds(unsigned char byte); + +/* mmu_emu.c */ +void mmu_emu_init(unsigned long bootmem_end); +int mmu_emu_handle_fault(unsigned long vaddr, int read_flag, int kernel_fault); +void print_pte_vaddr(unsigned long vaddr); diff --git a/arch/m68k/sun3/sun3ints.c b/arch/m68k/sun3/sun3ints.c index 36cc280a4505f5d2..781e7c0a6f523a2b 100644 --- a/arch/m68k/sun3/sun3ints.c +++ b/arch/m68k/sun3/sun3ints.c @@ -17,7 +17,7 @@ #include #include -extern void sun3_leds (unsigned char); +#include "sun3.h" void sun3_disable_interrupts(void) { diff --git a/arch/m68k/sun3x/config.c b/arch/m68k/sun3x/config.c index e2a5d84df6d214d1..798ea72a0ea3c3e2 100644 --- a/arch/m68k/sun3x/config.c +++ b/arch/m68k/sun3x/config.c @@ -22,11 +22,10 @@ #include #include "time.h" +#include "../sun3/sun3.h" volatile char *clock_va; -extern void sun3_get_model(char *model); - void sun3_leds(unsigned char byte) {