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;