From patchwork Thu Sep 27 17:03:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 10618349 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 DDD98112B for ; Thu, 27 Sep 2018 17:04:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9AFE2BBF4 for ; Thu, 27 Sep 2018 17:04:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BD4252BC04; Thu, 27 Sep 2018 17:04:14 +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 A1B7F2BBF4 for ; Thu, 27 Sep 2018 17:04:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C1FCA8E0004; Thu, 27 Sep 2018 13:04:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id BCE868E0001; Thu, 27 Sep 2018 13:04:12 -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 A97BC8E0004; Thu, 27 Sep 2018 13:04:12 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) by kanga.kvack.org (Postfix) with ESMTP id 811DF8E0001 for ; Thu, 27 Sep 2018 13:04:12 -0400 (EDT) Received: by mail-ot1-f71.google.com with SMTP id c24-v6so4054595otm.4 for ; Thu, 27 Sep 2018 10:04:12 -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:message-id; bh=NeLv9ttxbwISQHkyrlHr74zLbay6ARPh/kQ9YOyxjxo=; b=AMf4pWVN2535c2eqB3aNlGRfnEb3Xzx2UGk+abf2Notxnhm6CL2wDuTwHMy9sA6Xmn 0F9HJjYrh1aJLAucORGEGQqt1F3uBebfRi+XfUMnEnANhDRDD9Y6ErzDpNo2dVrmqLkc jF6iwWcePyvN5AhYrqOn10Nyuxybx1zBogvKcsM/yaIqKDovIqOLsx/aH6Au75q3iFtA hxjxVcO/DjaN0Vpu3x9WaBU2Hd6epg6J7rgZsjvHXgtnmy/JWrObaT0EcQzXF4N6lZ46 Vg55XQ2Y15MlIw3mMV3u1QCZ0ly1i4v7qBGGq3Kpbm+6PzF36uyomvKzXILYSjPbbd0H zsiw== 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: ABuFfoi7p1ya3CyNxRFG4+TCw1l8QkwU8Sku17KE3AEstTUAT1F7yXLM 4MbxozABvxnsBd4ALrcJ+c7clPmTjG2wg+bxcF1lBXHtw8u+WgRjdvq53eQ4KWVW32q1fshio+P 180msAh7X91zy9B1ixHB7adRuTUGrIAzwtbYEfjuWyLzEbP1rAgKuFrI+zqzCMxQ= X-Received: by 2002:aca:6057:: with SMTP id u84-v6mr3484176oib.361.1538067852287; Thu, 27 Sep 2018 10:04:12 -0700 (PDT) X-Google-Smtp-Source: ACcGV63o3xuAuXLUbu7L+iyGWXHG8Fw5pEw4swe/nkNb0D6s3MF85Lz8ILh8a0FmGR1362REH2Of X-Received: by 2002:aca:6057:: with SMTP id u84-v6mr3484150oib.361.1538067851685; Thu, 27 Sep 2018 10:04:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538067851; cv=none; d=google.com; s=arc-20160816; b=bW0GJhHRNnilv/RE7zn+/2VDDkGh4M20bJ3yERSB5noLlUUtyEI4VoJPqu5nqtpH7f nhq4ccrIiPVg2TbBgsn01M2iSiInunGnAgRrXbo0dnRUUMAcQDxZeA2i88nC1T+nfLDe CDOGEEyTR+JfR1Qq2RwSRlFoJFSfR9gRQ1N2XRTUTidC2+qjYu073KqjvSABsa3EMquq ZwDfG2rhVlqcZV3hAMVcM5GTsGG//vDBzf0m1FAr9XXRJ8GQILjVhhC+a4nFGn6wZWhO 0s/QkC+q/KwkyiFTcuh1SDBzOkx/VGR8X4PM7b3H4A+AQKNmnVMU1gIhqPqevqxZVMOu 9wzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from; bh=NeLv9ttxbwISQHkyrlHr74zLbay6ARPh/kQ9YOyxjxo=; b=bN+XDYTgjS7giIMEph1n65txEj0mwPAeTlr7ypOoQiGwRR/VQbojsjUwHVSvhCFpa5 eEGogUOmgd/+dFGzzj3tdCI4pNWAANMaCROjOakatO710lbGy+1g2/ZtQhgL7m83CrP+ BDme0j/06nDOzFwc+MmUgVU5LVIJ5ehGxy+qp5BdpXnllbTlLR/fiqssihYOBfM08f/S 9Tpt5icKdXqRsyOsjmV/wHj3L1qnfC45emqRnbVu344JBgLKHVIo5guGtFZkpXxWfjhn FNlVvsgfkDslatrdJjFOfl1Ud1vEPdVgaiJVuqNzrSjx4qDMCAzDy1dtzT8XjDj/0UtR gEsw== 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 x62-v6si1111220oif.93.2018.09.27.10.04.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 27 Sep 2018 10:04:11 -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 (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w8RH4ASO058818 for ; Thu, 27 Sep 2018 13:04:11 -0400 Received: from e06smtp03.uk.ibm.com (e06smtp03.uk.ibm.com [195.75.94.99]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ms293tukw-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 27 Sep 2018 13:04:10 -0400 Received: from localhost by e06smtp03.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 27 Sep 2018 18:03:59 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp03.uk.ibm.com (192.168.101.133) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 27 Sep 2018 18:03:56 +0100 Received: from d06av23.portsmouth.uk.ibm.com (d06av23.portsmouth.uk.ibm.com [9.149.105.59]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w8RH3t2N59899962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 27 Sep 2018 17:03:56 GMT Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5D848A4059; Thu, 27 Sep 2018 20:03:36 +0100 (BST) Received: from d06av23.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BAED7A405E; Thu, 27 Sep 2018 20:03:34 +0100 (BST) Received: from rapoport-lnx (unknown [9.148.204.195]) by d06av23.portsmouth.uk.ibm.com (Postfix) with ESMTPS; Thu, 27 Sep 2018 20:03:34 +0100 (BST) Received: by rapoport-lnx (sSMTP sendmail emulation); Thu, 27 Sep 2018 20:03:53 +0300 From: Mike Rapoport To: Andrew Morton Cc: Alexander Duyck , Michal Hocko , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport Subject: [PATCH] memblock: remove stale #else and the code it protects Date: Thu, 27 Sep 2018 20:03:45 +0300 X-Mailer: git-send-email 2.7.4 X-TM-AS-GCONF: 00 x-cbid: 18092717-0012-0000-0000-000002AF7249 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18092717-0013-0000-0000-000020E391AE Message-Id: <1538067825-24835-1-git-send-email-rppt@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2018-09-27_08:,, 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=665 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1809270159 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 During removal of HAVE_MEMBLOCK definition, the #else clause of the #ifdef CONFIG_HAVE_MEMBLOCK ... #else ... #endif conditional was not removed. Remove it now. Signed-off-by: Mike Rapoport Reported-by: Alexander Duyck Cc: Michal Hocko --- include/linux/memblock.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index d3bc270..d4d0e01 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -597,11 +597,6 @@ static inline void early_memtest(phys_addr_t start, phys_addr_t end) { } #endif -#else -static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t align) -{ - return 0; -} #endif /* __KERNEL__ */