From patchwork Tue Feb 12 14:00:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anup Patel X-Patchwork-Id: 10807973 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 24D391575 for ; Tue, 12 Feb 2019 14:00:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 132292B56B for ; Tue, 12 Feb 2019 14:00:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 110852B7CE; Tue, 12 Feb 2019 14:00:25 +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 5D9A82B56B for ; Tue, 12 Feb 2019 14:00:24 +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=nCnPItQSkzZYH3nfhujgICZ9tIxh2BnKHSE4GtCJRpc=; b=kBE17+VNOZSJ6W Q687bfzekbIumngTB9xAVGInURdn5xGt4RBaxutJqRB3bar2ruTH3WIPAvdmtlvIZneFG+mykmKtw TW/7PTsNLTvo7O5IjHh3xBFYJlPEGWM1dihUbld22GMaO0QiUTMQxpUOSyvdq/liwLQoz6JPkr4iN 96J6+SwgWNDD1FJQc4wXLMol+u75wueJZTg2REDjLO72HNiqappfdmnFYMDhQSLMFq0Vc5iCw4CT8 Cp2lglJ5m0OEiNGReodzihSzzQH/AOGvYdYNhieGqTzhv7MnUSKqOQdEZ00fgQIPtdWQU+9J6n8SK VQp8N2xkzIaPfsx7gIIQ==; 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 1gtYbm-0002yK-32; Tue, 12 Feb 2019 14:00:22 +0000 Received: from esa3.hgst.iphmx.com ([216.71.153.141]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gtYbe-0002wG-MQ for linux-riscv@lists.infradead.org; Tue, 12 Feb 2019 14:00:20 +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=1549980015; x=1581516015; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=peWHjgeJOcMs/VI6T5c3UHJM4S2Ufl+OBhS24TMyuHU=; b=fI8+ZH6DumvacDuo9mOHV/mH9otWm0r8grlw8zTdwZwjZnG+zR6DV857 pQTmQ4I2Wqij/qdYgdu5MKlRQG5BBpNU6+V/hZftEh3T6ISoQ553hizm+ F4R9lPr+XgD+ZqDx3v46CTs0Vuvf5MQODDU+AiP1orYBfICFW2rfzpJA2 coSbs7UB/78o9OVck4L2RBZBs3at6F1q85hYmSxHsDWwBRNHSSM0bL57h kJcJKQASM63ieR9DpPnJHW0lqh1VPz3bPEf4vv59I0F58ZVBeoYeJBF7u HqpWFTx7Wc8yAqkDJ56JnWYjKewYniJfMPFVzNc/jVXAFwCFT4XuQ5DkY Q==; X-IronPort-AV: E=Sophos;i="5.58,362,1544457600"; d="scan'208";a="106025549" Received: from mail-bn3nam01lp2053.outbound.protection.outlook.com (HELO NAM01-BN3-obe.outbound.protection.outlook.com) ([104.47.33.53]) by ob1.hgst.iphmx.com with ESMTP; 12 Feb 2019 22:00:14 +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=eE7cuLCrwqeCI2GErviQj8ukoOuFeD6pf7McpNqny80=; b=PnsjftTUhZYNtf2Qzp0sFq5RlHfPS0XYC+J00NL1zOzTowrlIDdw57q6Dj7111CUj0MMOFabbLPw2FqjIwPPt2B+492J5LlF9PdlMJfSRkO+424Kji4PRY8+4zNQrOH02hbyOh/+CaxzUiSJz7a4lkOFpxRtnjQOe0Fl+vUQvLI= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.247.148) by MN2PR04MB6062.namprd04.prod.outlook.com (20.178.247.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1601.21; Tue, 12 Feb 2019 14:00:12 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::2cdb:c465:af57:8be1]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::2cdb:c465:af57:8be1%7]) with mapi id 15.20.1601.023; Tue, 12 Feb 2019 14:00:12 +0000 From: Anup Patel To: Palmer Dabbelt , Albert Ou Subject: [PATCH v3 1/6] RISC-V: Move free_initrd_mem() to kernel/setup.c Thread-Topic: [PATCH v3 1/6] RISC-V: Move free_initrd_mem() to kernel/setup.c Thread-Index: AQHUwttFxrDRYApwwUmalY3+4syPHQ== Date: Tue, 12 Feb 2019 14:00:12 +0000 Message-ID: <20190212135942.105008-2-anup.patel@wdc.com> References: <20190212135942.105008-1-anup.patel@wdc.com> In-Reply-To: <20190212135942.105008-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: MA1PR01CA0126.INDPRD01.PROD.OUTLOOK.COM (2603:1096:a00:35::20) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:de::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [49.207.48.205] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 246676c1-51ca-4d7e-bdbf-08d690f267b6 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(5600110)(711020)(4605077)(4618075)(2017052603328)(7153060)(7193020); SRVR:MN2PR04MB6062; x-ms-traffictypediagnostic: MN2PR04MB6062: wdcipoutbound: EOP-TRUE x-microsoft-exchange-diagnostics: =?iso-8859-1?Q?1; MN2PR04MB6062; 23:ahieP0LQNL3ngaItGn/lMOAjVLyaqc6cnv/WtIE?= =?iso-8859-1?q?NHlLlfaG0R6sO+C?= =?iso-8859-1?q?nMddHrmcKGfAhIeMOKeQJy0pkJz0KjP17v0e/AA1Q5YoTkzDW8/v0HGszd/v?= =?iso-8859-1?q?HEL3a/v37wtoyyFsLn+oqT1NStZwxDbpzBLcL7dMdu6LZVIbXl8WKP7E0tCq?= =?iso-8859-1?q?AkB+Clxy+DR4s4VYfbQqteUSbxo2AQhldFExU8vjcDIYXQh6a4Z5T0SuKUlu?= =?iso-8859-1?q?bX/hDE6137Usi5mFUW/LNqy43moKLQUrUuUbUX8qzPDFJX04GdR57hAZfSjK?= =?iso-8859-1?q?miHFdfLzqdux8/79tCA0LHOFZXPLsyPZXh7oOT5u6Y4EWObiP2rvx+JDJLDV?= =?iso-8859-1?q?Y4Xj+nPRMzYe78xUKdQ4/VkX34mAooh0dkK10wUd6SbpDKyKPLpNGyxplhOR?= =?iso-8859-1?q?FPPRWrXu0k+92uv3mekMR88cTo/Xf49Z6+4q6ZTRZjrqhp0dJ75+j1XOjcFC?= =?iso-8859-1?q?7h36wiZrh1rYU5OiqNGW4//lxmeOn/P3V0EccNjaJIWq7e60PivEiagPzii0?= =?iso-8859-1?q?w5pyDshuNp1nELXJSmODXItDgfJFwroPFu8Qgzsi8cKaMPyUdrwpiAIrNf42?= =?iso-8859-1?q?Q+vXWGWMSUObfmLqgQwAYAhjHqQbUJ/AVsgT/UcPyymRDvuPT85UQG9klSwF?= =?iso-8859-1?q?9TCInmg9rEZnCU/BoX6ckvTYeMQsgif0WswNqGh3GGCOmA6ebUX28b+fYIBp?= =?iso-8859-1?q?JNl046VSvPw8GxMGcWlLsg1SA3pgSbCSx3m2YEKopw0R2td3qbdb4zpP5CLw?= =?iso-8859-1?q?20g9Ieh2U6Fn2i2V63P/2VcmzlSmR0n83nFDMLWryuW9mFeT49l5PoH6rcrC?= =?iso-8859-1?q?2JMBIyA7XBjzluuY9eLkcnpydOgmoxk2TnquET3JJEm4Y/TewVy0GVNLP80J?= =?iso-8859-1?q?67EmP/3fOPhu0rt+JO0VpSdTLbxEfB/GFriWvxkjVN6TmXEJLKn5ge0XnD9C?= =?iso-8859-1?q?xkqv2JHIIDopO09S/11eGyxPJeHSvv4qEeTSfKcPn6Cr9wrWtWHeiKbfRkIm?= =?iso-8859-1?q?mVJYhdus61voFcprcWoIZlLQ/0Q0FNWIPLSm3nRgQ5ufpw4fAbC4KiKAo7/k?= =?iso-8859-1?q?SNmrWlKuxPCgWsSBJA3D6K6qM4XS3+uVpB3reBzaWbp66ch7kwTWHqzBr+m8?= =?iso-8859-1?q?HRxtXrulc0SlIMHmD/9Qigm591kJBxE+0xDH4w9DqDpCCHuUDX/bpkMUzLhD?= =?iso-8859-1?q?X1Z0WJUHGD2ngjNU/Z4HoEjiVwCpe5ExWlw2am6b/bVkhmy2C8opuBculgLu?= =?iso-8859-1?q?b9IZlsYWs7ubzskmbmR89xq910?= x-microsoft-antispam-prvs: x-forefront-prvs: 0946DC87A1 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39860400002)(376002)(346002)(136003)(366004)(396003)(199004)(189003)(8676002)(2906002)(81166006)(86362001)(44832011)(50226002)(2616005)(11346002)(106356001)(446003)(68736007)(316002)(53936002)(476003)(81156014)(76176011)(105586002)(25786009)(486006)(8936002)(55236004)(14454004)(6116002)(256004)(4326008)(36756003)(3846002)(71200400001)(71190400001)(102836004)(66066001)(386003)(52116002)(6506007)(99286004)(1076003)(186003)(6512007)(2171002)(54906003)(110136005)(6436002)(7736002)(26005)(72206003)(478600001)(305945005)(6486002)(97736004); DIR:OUT; SFP:1102; SCL:1; SRVR:MN2PR04MB6062; H:MN2PR04MB6061.namprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: xin1Qd57C4u8AhARWRLcm1/CfZlNIqdCc++l6wv//0AtyB98DBQUWIIfQHu/OiURVoeXhDkHRuTASPNd0Y9nkS7IwDAC97Pn+qidYLehSszUCgk/dh4xgY4A0NQ7YmCPIPpcWq6apjcs6mln0iEv0Vsa7wXH9V8UWkPgpiAeqpoF79yN2hpSE5s0MJEPEglyp03j9mVw1UyqKvpZCYjDLy5hrF88eCpiaPdiieTjf2xowbZOQ6tQBumYxvGHh5h9pWQNzbIe70YOvzmPKGczLXeATFcmlxQtoUAoYzypTSC11KAkd0RuJ64X5Tf4LtuWJ909FE2OI1SnrEV0gwEK4QguVEN3I6Z37NOVpnikHnFGr+dL3tXWHg6LXJ3vBeZXEfvt96FPlBCE2vOhICNoeu22ApHmZhPJus7hwtKqgQM= MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 246676c1-51ca-4d7e-bdbf-08d690f267b6 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Feb 2019 14:00:09.1711 (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: MN2PR04MB6062 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190212_060014_853194_26EED224 X-CRM114-Status: GOOD ( 13.68 ) 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 --- 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 */