From patchwork Wed Feb 13 06:32:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10809171 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4CD126C2 for ; Wed, 13 Feb 2019 06:32:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 396872C4A5 for ; Wed, 13 Feb 2019 06:32:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2D7CD2C4C2; Wed, 13 Feb 2019 06:32:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CA30A2C4A5 for ; Wed, 13 Feb 2019 06:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MHC18DoeB4dinbGGvP0XnxXlyNdhiRpkYinnO1KfVZs=; b=rjoYUkL2ubcjtq BT2OvVt9rM/g0xodDQ1bkTeMvYHOIs56wK8q4RAXhPn//7mIfSwIfLqJZZ3D4YhE4/coEo3+OPj+8 qjCEHVGxYaPjliImLYY6jLUxN2JrT2cPG1LxA5NCDFObnoqKUSmqh1mxicp5cqxZxzSOA8E9pFgnb Oj9N84N9//ltpwW2OfIK+HnfCppn3E6f3gsnw92et83c0ZzKsaMwKSGgEKiKSW/r74N8yNrLh//3X WwvbI46XaNaXnVCkxnt+sYOa72Di8MHaO7CTzIauAY/5bKKipY5ZtVd47RlcQLnNRFJIXGC5uUN5T vH8dCjXs6//Sf27Cnh4g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gto5v-0006re-AG; Wed, 13 Feb 2019 06:32:31 +0000 Received: from esa6.hgst.iphmx.com ([216.71.154.45]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gto5q-0006lZ-1f for linux-riscv@lists.infradead.org; Wed, 13 Feb 2019 06:32:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1550039547; x=1581575547; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=+/p8HkxkueZ7rQ8VzLG/lOFOWhPGN42z3n4YDQTEe1Y=; b=pQln9TujrmS3BAfZ02Tjp9cEbcRvnKOB6oIz+p6qAF4IjkThxMQltI/N VGGk9KP3HGsDWVUb4sc5vHsEPAp4WdKIPEbQBZo9w6GbCwqnLOlYvWfJZ 9oM5Xbd/SyLzd2HUCAcFkxhaGf5ox9AaAiyKFJ9fH55lbz9mK5y7/ui2T xNJpiGf4m0gSsvJEaFu4/+uqT5DyUsEEeAMGBLOmp+u9isWtYUeZtgybT ZJKLTScs5msyTyw5wUmXJ3uvqbAeTv4XQ4r4zyFpkfGOZLia3+bk1h68W tbA6ezh9T91tSSBvsn40uIY9z+++Sg1lpsrNdTkzb+Zn2RxbstkaxlQA9 g==; X-IronPort-AV: E=Sophos;i="5.58,364,1544457600"; d="scan'208";a="102859898" Received: from mail-co1nam05lp2050.outbound.protection.outlook.com (HELO NAM05-CO1-obe.outbound.protection.outlook.com) ([104.47.48.50]) by ob1.hgst.iphmx.com with ESMTP; 13 Feb 2019 14:32:24 +0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector1-wdc-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sxx+mlJOnQqF8LM3AFqxTEVHgpOYIFpbc+4AjA3qutU=; b=T0vTWxWZfRQq1mBruxLOubJxihzE3BrwOyjfAxksmV6Xt/THlVw2JHvi2rhsGBAOWsW6c8R266BxkYZ8wXQBQn2ExhpmmkHOuCHa+w40eDgMQtKnAjXmPoS67NzWK6BI72ccVxB383h6oYeljPpfUqZtV8r4u2i1GrB2CG5q3R0= Received: from DM6PR04MB6059.namprd04.prod.outlook.com (20.178.226.89) by DM6PR04MB5515.namprd04.prod.outlook.com (20.178.224.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.22; Wed, 13 Feb 2019 06:32:02 +0000 Received: from DM6PR04MB6059.namprd04.prod.outlook.com ([fe80::d006:5be7:c3f:ba6c]) by DM6PR04MB6059.namprd04.prod.outlook.com ([fe80::d006:5be7:c3f:ba6c%2]) with mapi id 15.20.1601.023; Wed, 13 Feb 2019 06:32:02 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v4 1/6] RISC-V: Move free_initrd_mem() to kernel/setup.c Thread-Topic: [PATCH v4 1/6] RISC-V: Move free_initrd_mem() to kernel/setup.c Thread-Index: AQHUw2XUM0HeGU3JKUmZsgmw0A9sjg== Date: Wed, 13 Feb 2019 06:32:02 +0000 Message-ID: <20190213063127.28703-2-anup.patel@wdc.com> References: <20190213063127.28703-1-anup.patel@wdc.com> In-Reply-To: <20190213063127.28703-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR0101CA0027.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:22::13) To DM6PR04MB6059.namprd04.prod.outlook.com (2603:10b6:5:129::25) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [129.253.179.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7afd3fc0-37b8-46df-590e-08d6917cf6bd x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:DM6PR04MB5515; x-ms-traffictypediagnostic: DM6PR04MB5515: wdcipoutbound: EOP-TRUE x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; DM6PR04MB5515; 23:Ru+yyp8fRRKgnE+O6K89A+ODEm7aKdJONymiwXu?= =?iso-8859-1?q?B3LmjezHXAvyysR?= =?iso-8859-1?q?CVr416VCmyYup3z82B3AzVE5YF1E/Qg6C3inBCrEjtj0R/P+citeWMsfzTyW?= =?iso-8859-1?q?tGJzHs5LfuvjzKyRz2vKKOopnukP2405pp5Q2vHFux1GQviuB+5YwRwOppEn?= =?iso-8859-1?q?z/YkKcRI+aP0i8DzRFB9vXl0yhyjtEF1o3PWgKlj3HmdSE7OdSEwp65fNQAQ?= =?iso-8859-1?q?1fZS38wti8vR2gA4pPzC1FAkEHN2OMhHNX9NrnvNN3muRy9IkwmIv2IHwxOB?= =?iso-8859-1?q?OHOXeBZz1OHMwDZFSLL8FT0JG20ORE2P4KY6bqvz9Qw/BfLyvGVj+AVCFXna?= =?iso-8859-1?q?WSNn+Z5AcmN8+lzJ0450ZnVa1S9anU8g7gGTqrcGoDaPaPkXhY+LgNSFkWEj?= =?iso-8859-1?q?+OLNl8W6j7ksOXeyoCT2cVWpjTy3B/RiCaH5pvB59Ksj3WAp7T90jb6vUAGZ?= =?iso-8859-1?q?gTIhSPACuv5AqtLTb4OyTfmjGnfYKK9KleGwY9NSpzYQP9eHRzi/VizmFIi6?= =?iso-8859-1?q?crv/D/COqkq4JoH3rByQ38KpTIgWSskNWlrzuRhTdj/3DV1frLemXIHjs8cO?= =?iso-8859-1?q?qoDPhhkhOAw/G7Q+EjSw/ZWcZkGALFcg0o+Qs+l0S9E6ixRPEvpeHGLW1O5l?= =?iso-8859-1?q?bqK6sxkr4rjupNK9TcRfZjijMefbqgHVXt2yyriTIB/AICRqZU2XA1WPtcU6?= =?iso-8859-1?q?xdHHbTCgd754sLBimbk9SsBSxOwyxg4zX+Wxyh8EohAGtVmnP0N9vjLTKkrf?= =?iso-8859-1?q?a6T9ymg5rxaJBvdZA3nv2NfTLeNQr2AzRcQS90PCZsctaNcku+HAlnyiemFI?= =?iso-8859-1?q?QgNgeTgWkoCvt1UeolC3fp5JercTEWI2B36EMGuqlDqLI6V8W7o//gc+jCeF?= =?iso-8859-1?q?RmX6SnaIOw4XpX99g3LcfbT6O9aQe70sqQeyG3Vs9T7kg2i28A93Y5MsnS9K?= =?iso-8859-1?q?e96t6PTr2upVSYE4HjWsuIBMIgyY5WhJ40PyJb+J0m5Zu3dF3RmGrjfPB3yD?= =?iso-8859-1?q?mFOBF7F+PAsP83RYpVYq5L6ve/FVVEt/TIdLFiGWymBzq2Hc1AIR/PO739lU?= =?iso-8859-1?q?AYP9IIyr5ax7sAnTxyiOJ/ykhUwmNflu+rkAzLhx75csS7ZexmLhGGe2oVmK?= =?iso-8859-1?q?0TgSAZWxq6s80ZRCvshUPFNIEMDN/StPEeBiSdD0J++ksCb/XuMd76mPGO9k?= =?iso-8859-1?q?BsnELBwZOkUFbKX5AVIec78IM4JHshQ64rLoi8giHS9n9wd4Xg/WIwSEc3N3?= =?iso-8859-1?q?MvUDY9SJTJD2fX0HtBOHLfedpO?= x-microsoft-antispam-prvs: x-forefront-prvs: 094700CA91 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(366004)(39860400002)(346002)(396003)(376002)(199004)(189003)(1076003)(6512007)(2171002)(478600001)(72206003)(446003)(386003)(6346003)(2616005)(11346002)(102836004)(6506007)(476003)(2906002)(256004)(50226002)(4326008)(97736004)(14454004)(6486002)(110136005)(25786009)(6436002)(68736007)(316002)(44832011)(486006)(99286004)(36756003)(8936002)(186003)(6116002)(106356001)(81156014)(81166006)(8676002)(3846002)(86362001)(26005)(105586002)(71200400001)(71190400001)(66066001)(305945005)(53936002)(52116002)(7736002)(76176011)(54906003); DIR:OUT; SFP:1102; SCL:1; SRVR:DM6PR04MB5515; H:DM6PR04MB6059.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: Z/+k1kL3m5Ezi+vw8DoPnzd8eDogu4WAijlP41ExbSzZ0t8Cm2IF87iNX9+u2Xvq1tcGZHsFC+rN1C/58ePiIKOqLm41rqOb2PjWy8wsbIY5LA0xzpJGP8LxAE4FH3AQi0hUVtLQN82QoGZ9gtpgBZCGh53JCaiMmz8sLDS52TJ8ycC08qWl1UJCYfuyjVtIM1icZzmXXWpW8ZGVyqwekZpTtJ38hiaSsQHVNWgojk0MyxkPVqJiKVLWfHMg1s73z3ZnX/AEgCiwiSWxsSRLtJrOEOACdJdZrfJz5jncWktEn2JD3KRggzdiaFPZ0GQGwqItZs3zVHWbkl1ZjWImgRmlGR1vxPR0ebjFvdnU8f7uWLph2qc0U3e19OLxAekAvJS+Ii/HuteW0eRULalX7VNzp4b27Jxys79HESvcnK8= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7afd3fc0-37b8-46df-590e-08d6917cf6bd X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Feb 2019 06:31:59.3520 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR04MB5515 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190212_223226_412774_2683767A X-CRM114-Status: GOOD ( 14.44 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Anup Patel , "linux-kernel@vger.kernel.org" , Christoph Hellwig , Atish Patra , Paul Walmsley , "linux-riscv@lists.infradead.org" Sender: "linux-riscv" Errors-To: linux-riscv-bounces+patchwork-linux-riscv=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We move free_initrd_mem() to kernel/setup.c so that all initrd related functions are in one place. Signed-off-by: Anup Patel Reviewed-by: Christoph Hellwig Reviewed-by: Palmer Dabbelt --- arch/riscv/kernel/setup.c | 4 ++++ arch/riscv/mm/init.c | 7 ------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c index 77564310235f..36f60b4d2147 100644 --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -96,6 +96,10 @@ static void __init setup_initrd(void) initrd_start = 0; initrd_end = 0; } + +void free_initrd_mem(unsigned long start, unsigned long end) +{ +} #endif /* CONFIG_BLK_DEV_INITRD */ pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss; diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c index 658ebf645f42..504a5e491f5a 100644 --- a/arch/riscv/mm/init.c +++ b/arch/riscv/mm/init.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include @@ -64,9 +63,3 @@ void free_initmem(void) { free_initmem_default(0); } - -#ifdef CONFIG_BLK_DEV_INITRD -void free_initrd_mem(unsigned long start, unsigned long end) -{ -} -#endif /* CONFIG_BLK_DEV_INITRD */