From patchwork Mon Aug 6 10:52:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10556813 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 4573513B4 for ; Mon, 6 Aug 2018 10:52:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 336DF291CE for ; Mon, 6 Aug 2018 10:52:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27694291F3; Mon, 6 Aug 2018 10:52:55 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B0C67291CE for ; Mon, 6 Aug 2018 10:52:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BCA8C6B026C; Mon, 6 Aug 2018 06:52:53 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B51586B026D; Mon, 6 Aug 2018 06:52:53 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9F2EE6B026E; Mon, 6 Aug 2018 06:52:53 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by kanga.kvack.org (Postfix) with ESMTP id 6A2616B026C for ; Mon, 6 Aug 2018 06:52:53 -0400 (EDT) Received: by mail-oi0-f69.google.com with SMTP id v4-v6so11664954oix.2 for ; Mon, 06 Aug 2018 03:52:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=NVwy3JioF07zB7k/lZIsvQvZ7f4Fd5u/WH3bJtkRsH8=; b=W9mziScaHsf+i0WGFE386oT55nboPxqT2A8xN7YaFyO+k+iHXVYq737QNd+1dJNcLc rM4jPfmxnLBFHBDBlHdeHcHmCArdv6LLKV2hfygUvTsd99QJSpfUhhXIhz8/VSf1aYkm lh2YJGxKnlGuXsMQUG3SZd+UvtLhfSQYZ3qtqWZ+2dJFrxv2nbUlrliYu7EbJe05ZwMa UrQkOJcLT6edysySd4Un+iEcYPbKaqlZS8xjGDWfjTHyICdbD0b0QfF3CQFUxn9BcXF5 gudIJdyhA3YiVX7cYOuLBf4ca63/VtS24mup/oV7QtgkWWmcAZque1GDQAJeTed4Qwdq 5BhQ== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AOUpUlHbcpMMj4yQDnTpBH+jqHcWPOxigKR80FHGwNTTMuXystwJWjT2 bAQDK6iu8QFDOfHn9g17Q9iJuNpGsD6+5Gd9/zipG7pv2CsS5z1boLTdihMQplQSaBQ0j9kTOe9 Ad4fkMgNdpLz/kUoNxRGhQg9YPPPJI7q/tVvaVSXLi5lbsmDMD02Dix6nuzDkBjk= X-Received: by 2002:aca:40d6:: with SMTP id n205-v6mr14672293oia.35.1533552773169; Mon, 06 Aug 2018 03:52:53 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcp/bioAsw/2Y4TcvlKxYZyjW4SMseGLuF6/YEhI5Tc3UK+/OYJSe029nYdgtPuwqMaWhpB X-Received: by 2002:aca:40d6:: with SMTP id n205-v6mr14672263oia.35.1533552772456; Mon, 06 Aug 2018 03:52:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533552772; cv=none; d=google.com; s=arc-20160816; b=oOBjZHS2JNLbyamX4Z7mFzD94XkX4dMbTnLm+nfjvfCoT7eNmzJzfW+EVebdYxoNIE TTL/F3Pju8Cdo3WwoCEPN33JhydkT6v+rtx0bhEGtw3wMSEWkcqan2yjlsvj2Yd0nkH8 vPwfHpO8ORy42MulSkly+A6sJjM+t7ihcLJK4RijlmGXhSiPV3mFo9veCZZshmxYm6DT 5zM82W4Bi9aunYJNsbizqYfyp0V4NszWLKq3k/hpaVc7x1PoFJ68oNadodpyu9cnSJr/ EyDrl3QbFoXEq4oAWW0tri9kbXlfIlHoo/PrwQIwBtSUwRwKLIHsazhYTkIsJgtpNE92 3Ekw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=NVwy3JioF07zB7k/lZIsvQvZ7f4Fd5u/WH3bJtkRsH8=; b=bxfGm3g2Wvccf178viQC9OuBF6u16SW3CA6C05phNfd7tx4JxpDfcdnPMVK650EGem imHKOeN8ke3vBuM2NFWE+mX/KM+rLy6okTLK/ZFcxuP4Ei8/6J/oYY6aqbIs9prXHNJn PiEicxCTJ4+ID3PpxqXhJq0m6R2fw01V5SuC4NdSLVKDdnKTRPPTIU8/9u4asDAN9mNb DlGnpfdySCb/CLfGh8524tU/wlOTqGmZGJ7+xXy+BoIo+v6m6XsZ4fdMhTxalNB1yeOv ePWeR9ghLoGG01itugbz3440iRv/hV3whQP7n11vLK1HQAIfxXWHbGTWDTxV934HZwGs YzcQ== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id d40-v6si8827615oic.337.2018.08.06.03.52.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 03:52:52 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098399.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w76An522088590 for ; Mon, 6 Aug 2018 06:52:51 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2kpm989kes-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Aug 2018 06:52:51 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Aug 2018 11:52:49 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 6 Aug 2018 11:52:45 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w76AqicB18087976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 6 Aug 2018 10:52:44 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A73CB11C05B; Mon, 6 Aug 2018 13:52:52 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 572F311C04C; Mon, 6 Aug 2018 13:52:50 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.115]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 6 Aug 2018 13:52:50 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Mon, 06 Aug 2018 13:52:40 +0300 From: Mike Rapoport To: "David S. Miller" Cc: Sam Ravnborg , Michal Hocko , sparclinux@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH v2 1/3] sparc: mm/init_32: kill trailing whitespace Date: Mon, 6 Aug 2018 13:52:33 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533552755-16679-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1533552755-16679-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18080610-0028-0000-0000-000002E62307 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080610-0029-0000-0000-0000239E4472 Message-Id: <1533552755-16679-2-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-06_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=863 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808060117 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Mike Rapoport --- arch/sparc/mm/init_32.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 95fe4f0..3ec10b2 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -133,7 +133,7 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) } /* Start with page aligned address of last symbol in kernel - * image. + * image. */ start_pfn = (unsigned long)__pa(PAGE_ALIGN((unsigned long) &_end)); @@ -214,7 +214,7 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; initrd_start = (initrd_start - phys_base) + PAGE_OFFSET; - initrd_end = (initrd_end - phys_base) + PAGE_OFFSET; + initrd_end = (initrd_end - phys_base) + PAGE_OFFSET; } #endif /* Reserve the kernel text/data/bss. */ @@ -322,7 +322,7 @@ void __init mem_init(void) map_high_region(start_pfn, end_pfn); } - + mem_init_print_info(NULL); } From patchwork Mon Aug 6 10:52:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10556815 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 184BC1390 for ; Mon, 6 Aug 2018 10:52:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05DBD291CE for ; Mon, 6 Aug 2018 10:52:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE4CA291F3; Mon, 6 Aug 2018 10:52:58 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 50224291CE for ; Mon, 6 Aug 2018 10:52:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33C606B026F; Mon, 6 Aug 2018 06:52:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2C5CC6B0270; Mon, 6 Aug 2018 06:52:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 13FE36B0271; Mon, 6 Aug 2018 06:52:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-oi0-f69.google.com (mail-oi0-f69.google.com [209.85.218.69]) by kanga.kvack.org (Postfix) with ESMTP id DAD796B026F for ; Mon, 6 Aug 2018 06:52:56 -0400 (EDT) Received: by mail-oi0-f69.google.com with SMTP id q11-v6so11632408oih.15 for ; Mon, 06 Aug 2018 03:52:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=XpmrnY1IzfkqNHvzsdIW8E2/L5TwGHdfJJfPWDV99vE=; b=d1aZSAvH2LVIj+mf7tP5iNyl3VN1vhlZpFlKeBH6vNyu7l9KHXp/CLVZ/xf9x4Sp7i Onmvd0PE7kkbmW3zOzlXiOcsGRFSfQK23kppzu4wTNDakt/lCA/FilVD9Du/uEQNN+No 6OnyWVaPjRCi8M9vgThkRmcphYdO+vZx4nsh9FBuyomVAULlVrWuJ1se/N9FF1yWUwHf j9quWb309PP3gyGOhn5w3cJwpEzii6svxVyMSUh1epkOSIi4dNbQLFJf5ZM3EY4H9kwa X2583SW9+jUmb4E+RMPIclJQMLFtRMeXoSaxquETmapcCRYYQX6ADiqRSYu9AmxgIGMC cOyw== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AOUpUlGhc+gzwxjByZAl9iUPpnrJSBEjkk2a5xOkA4VUTf/TyMuXU1fr BqVJUeZit8anWxXkRalX+AXtCJZJTJZrHX1M6VYI19P6sHoh59CL9P2sjpAyBQwKKlFUVLT4b+h jfukox1OYO1IFTZA2CP+0z7Hx8CS42CID8QU0/t4OglZekTjVd3Bq8X9sxtiO3fQ= X-Received: by 2002:aca:eb0d:: with SMTP id j13-v6mr15111745oih.304.1533552776662; Mon, 06 Aug 2018 03:52:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeOdwha9PvLP3oB78Ha8BdfkWkV+DJMQs0xgvV3ifpTDegqA+CwCLFIi7ZAa4JjWjnCSWur X-Received: by 2002:aca:eb0d:: with SMTP id j13-v6mr15111696oih.304.1533552775639; Mon, 06 Aug 2018 03:52:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533552775; cv=none; d=google.com; s=arc-20160816; b=GC9Ms/fJEoc8NZ2ShBNNDnJ42L5y6Ji4OWrGviBELTvz359uPU1RZtmoEabUHfnyYI G3p6HK72teiWAs+q9v4AjdgaWM9uXqVmf7ghJnTHUNm5rq9xkcO/nyN8ecHCuSDvEEYd kGCYilfA/vfQEMCclrO4hgsz/MgctZKLZTWJuiEsV+78GX8CM5jfjpsLjdcdn7wVUpTa 8Eq0LZy/ppD0GGjV4AeF9oS5+GRltNIWUW2uWc2jS/HmfSK7AmbxBGef75MWbxhZmGRu oZb31yzgO1JXOHDnaB+lYmVv0lmWwXeWXMGX8p7qHCICKw9xNlK2awWv+JZR4xR6iqGU aeyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=XpmrnY1IzfkqNHvzsdIW8E2/L5TwGHdfJJfPWDV99vE=; b=AJGP7u1IcfqiMFHoe34Pn+kgmLxTliAOpRiO6bwvRuYykLI7cR4ZvgfJ0T+a/UceC6 XNDsNBcA/GjmhWxViAxlPpTQ43rb3gEDu1oGElBdHsbFa/py2CW+ED31Pz94ZzYsrtrb 3DtsNgqLDs6HekFqyo4v7faOW9SgAlEa3nG7to0TWXkNUE7cpW1C0EZjsFj3JkQv9DEh re5tfpkPqsNLISRoYHhXLrOo0eecUe8xke8Lyvv7V4w1QjRIQecoZ0QY1w5hBWbjcuDi /k00vtQmz9qN/wxRVRAnInFOTWIG29YBM4Kflu1mD+JQuv8izLW1gGKZsCGKApHu3HL5 DVeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com. [148.163.158.5]) by mx.google.com with ESMTPS id b81-v6si7924185oii.36.2018.08.06.03.52.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 03:52:55 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.158.5; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.158.5 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w76An61v069730 for ; Mon, 6 Aug 2018 06:52:55 -0400 Received: from e06smtp01.uk.ibm.com (e06smtp01.uk.ibm.com [195.75.94.97]) by mx0b-001b2d01.pphosted.com with ESMTP id 2kpja3xarn-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Aug 2018 06:52:54 -0400 Received: from localhost by e06smtp01.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Aug 2018 11:52:53 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp01.uk.ibm.com (192.168.101.131) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 6 Aug 2018 11:52:49 +0100 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w76AqmUL42139764 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 6 Aug 2018 10:52:48 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EF717AE056; Mon, 6 Aug 2018 13:52:43 +0100 (BST) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8AEB5AE045; Mon, 6 Aug 2018 13:52:41 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.115]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 6 Aug 2018 13:52:41 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Mon, 06 Aug 2018 13:52:44 +0300 From: Mike Rapoport To: "David S. Miller" Cc: Sam Ravnborg , Michal Hocko , sparclinux@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH v2 2/3] sparc32: switch to NO_BOOTMEM Date: Mon, 6 Aug 2018 13:52:34 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533552755-16679-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1533552755-16679-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18080610-4275-0000-0000-000002A50D42 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080610-4276-0000-0000-000037AD0DAF Message-Id: <1533552755-16679-3-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-06_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=2 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808060117 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Each populated sparc_phys_bank is added to memblock.memory. The reserve_bootmem() calls are replaced with memblock_reserve(), and the bootmem bitmap initialization is droppped. Signed-off-by: Mike Rapoport Reviewed-by: Sam Ravnborg --- arch/sparc/Kconfig | 4 +-- arch/sparc/mm/init_32.c | 75 +++++++++++++------------------------------------ 2 files changed, 21 insertions(+), 58 deletions(-) diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 0f535de..0a874c8 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -45,6 +45,8 @@ config SPARC select LOCKDEP_SMALL if LOCKDEP select NEED_DMA_MAP_STATE select NEED_SG_DMA_LENGTH + select HAVE_MEMBLOCK + select NO_BOOTMEM config SPARC32 def_bool !64BIT @@ -60,7 +62,6 @@ config SPARC64 select HAVE_KRETPROBES select HAVE_KPROBES select HAVE_RCU_TABLE_FREE if SMP - select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP select HAVE_ARCH_TRANSPARENT_HUGEPAGE select HAVE_DYNAMIC_FTRACE @@ -79,7 +80,6 @@ config SPARC64 select IRQ_PREFLOW_FASTEOI select ARCH_HAVE_NMI_SAFE_CMPXCHG select HAVE_C_RECORDMCOUNT - select NO_BOOTMEM select HAVE_ARCH_AUDITSYSCALL select ARCH_SUPPORTS_ATOMIC_RMW select HAVE_NMI diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 3ec10b2..e786fe0 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -103,11 +104,14 @@ static unsigned long calc_max_low_pfn(void) unsigned long __init bootmem_init(unsigned long *pages_avail) { - unsigned long bootmap_size, start_pfn; - unsigned long end_of_phys_memory = 0UL; - unsigned long bootmap_pfn, bytes_avail, size; + unsigned long start_pfn, bytes_avail, size; + unsigned long end_of_phys_memory = 0; + unsigned long high_pages = 0; int i; + memblock_set_bottom_up(true); + memblock_allow_resize(); + bytes_avail = 0UL; for (i = 0; sp_banks[i].num_bytes != 0; i++) { end_of_phys_memory = sp_banks[i].base_addr + @@ -124,12 +128,15 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) if (sp_banks[i].num_bytes == 0) { sp_banks[i].base_addr = 0xdeadbeef; } else { + memblock_add(sp_banks[i].base_addr, + sp_banks[i].num_bytes); sp_banks[i+1].num_bytes = 0; sp_banks[i+1].base_addr = 0xdeadbeef; } break; } } + memblock_add(sp_banks[i].base_addr, sp_banks[i].num_bytes); } /* Start with page aligned address of last symbol in kernel @@ -140,8 +147,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) /* Now shift down to get the real physical page frame number. */ start_pfn >>= PAGE_SHIFT; - bootmap_pfn = start_pfn; - max_pfn = end_of_phys_memory >> PAGE_SHIFT; max_low_pfn = max_pfn; @@ -150,12 +155,15 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) if (max_low_pfn > pfn_base + (SRMMU_MAXMEM >> PAGE_SHIFT)) { highstart_pfn = pfn_base + (SRMMU_MAXMEM >> PAGE_SHIFT); max_low_pfn = calc_max_low_pfn(); + high_pages = calc_highpages(); printk(KERN_NOTICE "%ldMB HIGHMEM available.\n", - calc_highpages() >> (20 - PAGE_SHIFT)); + high_pages >> (20 - PAGE_SHIFT)); } #ifdef CONFIG_BLK_DEV_INITRD - /* Now have to check initial ramdisk, so that bootmap does not overwrite it */ + /* Now have to check initial ramdisk, so that it won't pass + * the end of memory + */ if (sparc_ramdisk_image) { if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE) sparc_ramdisk_image -= KERNBASE; @@ -167,51 +175,12 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) initrd_end, end_of_phys_memory); initrd_start = 0; } - if (initrd_start) { - if (initrd_start >= (start_pfn << PAGE_SHIFT) && - initrd_start < (start_pfn << PAGE_SHIFT) + 2 * PAGE_SIZE) - bootmap_pfn = PAGE_ALIGN (initrd_end) >> PAGE_SHIFT; - } - } -#endif - /* Initialize the boot-time allocator. */ - bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn, pfn_base, - max_low_pfn); - - /* Now register the available physical memory with the - * allocator. - */ - *pages_avail = 0; - for (i = 0; sp_banks[i].num_bytes != 0; i++) { - unsigned long curr_pfn, last_pfn; - - curr_pfn = sp_banks[i].base_addr >> PAGE_SHIFT; - if (curr_pfn >= max_low_pfn) - break; - - last_pfn = (sp_banks[i].base_addr + sp_banks[i].num_bytes) >> PAGE_SHIFT; - if (last_pfn > max_low_pfn) - last_pfn = max_low_pfn; - - /* - * .. finally, did all the rounding and playing - * around just make the area go away? - */ - if (last_pfn <= curr_pfn) - continue; - - size = (last_pfn - curr_pfn) << PAGE_SHIFT; - *pages_avail += last_pfn - curr_pfn; - - free_bootmem(sp_banks[i].base_addr, size); } -#ifdef CONFIG_BLK_DEV_INITRD if (initrd_start) { /* Reserve the initrd image area. */ size = initrd_end - initrd_start; - reserve_bootmem(initrd_start, size, BOOTMEM_DEFAULT); - *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; + memblock_reserve(initrd_start, size); initrd_start = (initrd_start - phys_base) + PAGE_OFFSET; initrd_end = (initrd_end - phys_base) + PAGE_OFFSET; @@ -219,16 +188,10 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) #endif /* Reserve the kernel text/data/bss. */ size = (start_pfn << PAGE_SHIFT) - phys_base; - reserve_bootmem(phys_base, size, BOOTMEM_DEFAULT); - *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; + memblock_reserve(phys_base, size); - /* Reserve the bootmem map. We do not account for it - * in pages_avail because we will release that memory - * in free_all_bootmem. - */ - size = bootmap_size; - reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size, BOOTMEM_DEFAULT); - *pages_avail -= PAGE_ALIGN(size) >> PAGE_SHIFT; + size = memblock_phys_mem_size() - memblock_reserved_size(); + *pages_avail = (size >> PAGE_SHIFT) - high_pages; return max_pfn; } From patchwork Mon Aug 6 10:52:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10556817 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 1058A13B4 for ; Mon, 6 Aug 2018 10:53:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F1B38291CE for ; Mon, 6 Aug 2018 10:53:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E559F291EE; Mon, 6 Aug 2018 10:53:05 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36606291CE for ; Mon, 6 Aug 2018 10:53:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D39B6B0272; Mon, 6 Aug 2018 06:53:04 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 55D036B0273; Mon, 6 Aug 2018 06:53:04 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3FD7B6B0274; Mon, 6 Aug 2018 06:53:04 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id D492D6B0272 for ; Mon, 6 Aug 2018 06:53:03 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id g11-v6so3890703edi.8 for ; Mon, 06 Aug 2018 03:53:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:in-reply-to:references:message-id; bh=FlNoTNQMOT4iy/rnXm9Q3ArF/PUrkwkGocJAK1A0JLY=; b=nuCKn7L/+xOHRSyfVlNWcHS+PdfXGIhin81Va2ZnKWeBLNKxsof1gar2M8rr4BiSQc nwTCPjWIdiZkiWc7hsQgCwsPGnLHTkNMysPxK57ouGoKoaOhj31ybkJKL7Ty1BsSMXLB VGMXFaGd4DmUv6DtADTZ5OqUwutqsmUvWoYVV+cbxJH9amYHZepPDTuUpibY/EmH6NqM PIY2LbSJKSSr+l92QAjHfaXVh3BRZjM+ELRe5Np2diGCrbJLjIhhiR1IN3Mgy2GaBdST 8Wm0PtADDrTZtO6mKzgmOjNMP9CEuF/fnKGwvYeYoAWO/PO2K+IL3iAKkvOy3HXTFU9B yUYw== X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com X-Gm-Message-State: AOUpUlE9LFya1/6RgNsGuhHYYdaKm0HnDycS/wnKNh+wTE8PLAlx3Ry/ K1GnsyVklyvBhfaRmCMbxfFKb82GIIjR10fyRIuTrDd/eP9kD2c56wN9JX82K+BIz47CXxarXf4 gTUV63sPuOhSsAeZOKXCBia9o/gYDVExPFTT8xu1o2oBKEnUM/A8M8NQHJx/mKz8= X-Received: by 2002:a50:9356:: with SMTP id n22-v6mr17395322eda.206.1533552783376; Mon, 06 Aug 2018 03:53:03 -0700 (PDT) X-Google-Smtp-Source: AAOMgpciSmPDNM28DT7kgT4XP7juoHilcF1i9UqqP1trf20jb2U0F4Hy0YCT+CeTP57K+k/wcYne X-Received: by 2002:a50:9356:: with SMTP id n22-v6mr17395274eda.206.1533552782534; Mon, 06 Aug 2018 03:53:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533552782; cv=none; d=google.com; s=arc-20160816; b=p2jPwmE5n7CXXLRYiTcuD7ixhtipWcVCjsUDuK8Pff5LyAlR+VEJ90Zs2Vn9/CTzrt EE8+aOJAxuZTVlXGx0DLWoxxjgbF5wQi6mw2yQrAzld8hc1r8UwW8F4xucvNMhKu/s4m eDqaohnXpN9RDGcEO0H/KnHyMFtygUPY/G4TKK+f4WaO71IHVF2XizgO/HopCrAg0gMo G2z8SaQaHwyrwWD+3W3u5Yzhtt4fPd+KjuFoV5BNdgwhM3sbsRBDg3GKlaZKwoXIf/NI pJKtvmyrch+5OoiYo+QEpwTX2hIcC6j5FBrjRXgBU8kB14HvjLzk0ZueDo4ccZAjL0xk vrUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:references:in-reply-to:date:subject:cc:to:from :arc-authentication-results; bh=FlNoTNQMOT4iy/rnXm9Q3ArF/PUrkwkGocJAK1A0JLY=; b=MoCSxATmIvjdLe9B5FDXnedY5rmp3YgIs7R6Ia640H4+tB0hB+ediGKu/Ko5+5sEp3 nSpUoaTW5vER8y85/JsE5AyuuWMMyVb4xSiHEVsyu3lNpXXPsO7WAgDT6WeThr/aAldY cS/kkoL2yjrL18hc9NFILCJKr1RUY77TFL8vgFKMz5Ko0yqtJbV1QvF8xs4xKIuh/D3P MSBUK+W3L2Mn/vWlZUF1P+azzzFrgbulvJSKt9un74YRKDU7SYnVCEEPFrW4YrQKt1Xb 5VSWV7pySgwqn1WhCj0oWg4AxwchLW43UozwDT8LwBxys5jdUiGSrZnl/XXk9l59VQHE uzwg== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com. [148.163.156.1]) by mx.google.com with ESMTPS id w49-v6si1490311edm.138.2018.08.06.03.53.01 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Aug 2018 03:53:02 -0700 (PDT) Received-SPF: neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) client-ip=148.163.156.1; Authentication-Results: mx.google.com; spf=neutral (google.com: 148.163.156.1 is neither permitted nor denied by best guess record for domain of rppt@linux.vnet.ibm.com) smtp.mailfrom=rppt@linux.vnet.ibm.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: from pps.filterd (m0098404.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w76An4Ah107994 for ; Mon, 6 Aug 2018 06:53:00 -0400 Received: from e06smtp07.uk.ibm.com (e06smtp07.uk.ibm.com [195.75.94.103]) by mx0a-001b2d01.pphosted.com with ESMTP id 2kpm971nb4-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 06 Aug 2018 06:52:59 -0400 Received: from localhost by e06smtp07.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 6 Aug 2018 11:52:55 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp07.uk.ibm.com (192.168.101.137) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Mon, 6 Aug 2018 11:52:53 +0100 Received: from d06av25.portsmouth.uk.ibm.com (d06av25.portsmouth.uk.ibm.com [9.149.105.61]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w76AqqvI10420372 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 6 Aug 2018 10:52:52 GMT Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CD21211C05C; Mon, 6 Aug 2018 13:53:00 +0100 (BST) Received: from d06av25.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6D34711C04A; Mon, 6 Aug 2018 13:52:58 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.8.115]) by d06av25.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Mon, 6 Aug 2018 13:52:58 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Mon, 06 Aug 2018 13:52:48 +0300 From: Mike Rapoport To: "David S. Miller" Cc: Sam Ravnborg , Michal Hocko , sparclinux@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH v2 3/3] sparc32: split ramdisk detection and reservation to a helper function Date: Mon, 6 Aug 2018 13:52:35 +0300 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1533552755-16679-1-git-send-email-rppt@linux.vnet.ibm.com> References: <1533552755-16679-1-git-send-email-rppt@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 18080610-0028-0000-0000-000002E62309 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18080610-0029-0000-0000-0000239E4474 Message-Id: <1533552755-16679-4-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-08-06_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1808060117 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP The detection and reservation of ramdisk memory were separated to allow bootmem bitmap initialization after the ramdisk boundaries are detected. Since the bootmem initialization is removed, the reservation of ramdisk memory is done immediately after its boundaries are found. Split the entire block into a separate helper function. Signed-off-by: Mike Rapoport Suggested-by: Sam Ravnborg Reviewed-by: Sam Ravnborg --- arch/sparc/mm/init_32.c | 56 +++++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index e786fe0..92634d4 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c @@ -102,6 +102,36 @@ static unsigned long calc_max_low_pfn(void) return tmp; } +static void __init find_ramdisk(unsigned long end_of_phys_memory) +{ +#ifdef CONFIG_BLK_DEV_INITRD + unsigned long size; + + /* Now have to check initial ramdisk, so that it won't pass + * the end of memory + */ + if (sparc_ramdisk_image) { + if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE) + sparc_ramdisk_image -= KERNBASE; + initrd_start = sparc_ramdisk_image + phys_base; + initrd_end = initrd_start + sparc_ramdisk_size; + if (initrd_end > end_of_phys_memory) { + printk(KERN_CRIT "initrd extends beyond end of memory " + "(0x%016lx > 0x%016lx)\ndisabling initrd\n", + initrd_end, end_of_phys_memory); + initrd_start = 0; + } else { + /* Reserve the initrd image area. */ + size = initrd_end - initrd_start; + memblock_reserve(initrd_start, size); + + initrd_start = (initrd_start - phys_base) + PAGE_OFFSET; + initrd_end = (initrd_end - phys_base) + PAGE_OFFSET; + } + } +#endif +} + unsigned long __init bootmem_init(unsigned long *pages_avail) { unsigned long start_pfn, bytes_avail, size; @@ -160,32 +190,8 @@ unsigned long __init bootmem_init(unsigned long *pages_avail) high_pages >> (20 - PAGE_SHIFT)); } -#ifdef CONFIG_BLK_DEV_INITRD - /* Now have to check initial ramdisk, so that it won't pass - * the end of memory - */ - if (sparc_ramdisk_image) { - if (sparc_ramdisk_image >= (unsigned long)&_end - 2 * PAGE_SIZE) - sparc_ramdisk_image -= KERNBASE; - initrd_start = sparc_ramdisk_image + phys_base; - initrd_end = initrd_start + sparc_ramdisk_size; - if (initrd_end > end_of_phys_memory) { - printk(KERN_CRIT "initrd extends beyond end of memory " - "(0x%016lx > 0x%016lx)\ndisabling initrd\n", - initrd_end, end_of_phys_memory); - initrd_start = 0; - } - } - - if (initrd_start) { - /* Reserve the initrd image area. */ - size = initrd_end - initrd_start; - memblock_reserve(initrd_start, size); + find_ramdisk(end_of_phys_memory); - initrd_start = (initrd_start - phys_base) + PAGE_OFFSET; - initrd_end = (initrd_end - phys_base) + PAGE_OFFSET; - } -#endif /* Reserve the kernel text/data/bss. */ size = (start_pfn << PAGE_SHIFT) - phys_base; memblock_reserve(phys_base, size);