From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.3 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D96C6C433DF for ; Wed, 1 Jul 2020 15:47:42 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id A4E2F20780 for ; Wed, 1 Jul 2020 15:47:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="0toF8QDQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A4E2F20780 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 533748D0050; Wed, 1 Jul 2020 11:47:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 509398D0047; Wed, 1 Jul 2020 11:47:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 446E58D0050; Wed, 1 Jul 2020 11:47:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0181.hostedemail.com [216.40.44.181]) by kanga.kvack.org (Postfix) with ESMTP id 313308D0047 for ; Wed, 1 Jul 2020 11:47:42 -0400 (EDT) Received: from smtpin25.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id EAEA1824805A for ; Wed, 1 Jul 2020 15:47:41 +0000 (UTC) X-FDA: 76989937122.25.cry04_0e09f5c26e81 Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin25.hostedemail.com (Postfix) with ESMTP id 41BB81804E3B3 for ; Wed, 1 Jul 2020 15:47:41 +0000 (UTC) X-HE-Tag: cry04_0e09f5c26e81 X-Filterd-Recvd-Size: 2628 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 1 Jul 2020 15:47:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:MIME-Version:Date:Message-ID:From:References:To:Subject:Sender: Reply-To:Cc:Content-ID:Content-Description; bh=oI/fY2RaXZUuyPG0X0PgxHQGxPFAsCvWrszGWSl/80o=; b=0toF8QDQEBaPnwGAYdAMyHSxHB i9i0k6LM1BUo0xVtQT+fOXgsgYLyO7ckqgiCz6Xcs4EtHpqxJxtylMBRJn+LEMabaGzJZgdkzllhb CMJ90sA+Q30hvqTDq1FkSpV8h5vFaXJrhXcF1hy++XPTcIitcN6WChR0EpcV2Y1KwdU3Mu7WrMXBy jiE44pcCQbogt11eI/tqOX0ayHVEZzGY7owwxbGOSacCk5FvkS8rkeY7RhkJQaxbGxKUQkwwI2ILw lK6dbG1Oy7TyUIZP9p+QcyOpZoeMFH1SqoLDJud+pMRG6kGtpcJqEpIDPLQm477LFs39/UgbRbGuc /Sn5oU4g==; Received: from [2601:1c0:6280:3f0::19c2] by merlin.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1jqexT-0003VV-QR; Wed, 01 Jul 2020 15:47:36 +0000 Subject: [PATCH -mmotm] mm/memory-failure: remove stub function To: akpm@linux-foundation.org, broonie@kernel.org, mhocko@suse.cz, sfr@canb.auug.org.au, linux-next@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org, Oscar Salvador References: <20200701045312.af2lR%akpm@linux-foundation.org> From: Randy Dunlap Message-ID: Date: Wed, 1 Jul 2020 08:47:30 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.9.0 MIME-Version: 1.0 In-Reply-To: <20200701045312.af2lR%akpm@linux-foundation.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US X-Rspamd-Queue-Id: 41BB81804E3B3 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam02 Content-Transfer-Encoding: quoted-printable 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: From: Randy Dunlap This stub is no longer needed since the function is no longer inside an #ifdef/#endif block. Fixes this build error: ../mm/memory-failure.c:180:13: error: redefinition of =E2=80=98page_handl= e_poison=E2=80=99 Signed-off-by: Randy Dunlap Cc: Oscar Salvador --- mm/memory-failure.c | 4 ---- 1 file changed, 4 deletions(-) --- mmotm-2020-0630-2152.orig/mm/memory-failure.c +++ mmotm-2020-0630-2152/mm/memory-failure.c @@ -169,10 +169,6 @@ int hwpoison_filter(struct page *p) return 0; } =20 -static bool page_handle_poison(struct page *page, bool hugepage_or_freep= age, bool release) -{ - return true; -} #endif =20 EXPORT_SYMBOL_GPL(hwpoison_filter);