Message ID | 1572850587-20314-5-git-send-email-rppt@kernel.org (mailing list archive) |
---|---|
State | Awaiting Upstream |
Headers | show
Return-Path: <SRS0=Gf7V=Y4=vger.kernel.org=linux-parisc-owner@kernel.org> Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B518B13A4 for <patchwork-linux-parisc@patchwork.kernel.org>; Mon, 4 Nov 2019 06:57:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 93A4921D7D for <patchwork-linux-parisc@patchwork.kernel.org>; Mon, 4 Nov 2019 06:57:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572850643; bh=yv9SFIdg5D2vfTnwk1AOT8EqOCosf2YIIQ4xx40h8eQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=epHQLzbPnPx/JBwrrK5kVYyEBm9S77MPkWaYH8RlQ1t2D6QsEXpOTu9YCdz08mhBe TCbZjtmA7evMSoJUG8dHC/qXos/tkL44gEp9jOg4Rlgy/q4JV1vEOKQRwr7U8mtf/c lKDrL5qKAIidNLUFbZwiiGZT7UZipQJFMeEPLs4w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728367AbfKDG5U (ORCPT <rfc822;patchwork-linux-parisc@patchwork.kernel.org>); Mon, 4 Nov 2019 01:57:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:32906 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728054AbfKDG5T (ORCPT <rfc822;linux-parisc@vger.kernel.org>); Mon, 4 Nov 2019 01:57:19 -0500 Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D8015222CA; Mon, 4 Nov 2019 06:57:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572850639; bh=yv9SFIdg5D2vfTnwk1AOT8EqOCosf2YIIQ4xx40h8eQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E5iHBsuhp2lWDftHIUjMTgNrb9d3OXEoJZERi57kKCP0PEGOZ4wZK7wu8KxhJyfw6 SKgz3iTVuVv3anHfQZ1AQbYheTA7JpN2UuOWI6Cmn2Rp2xtzIp224LVZ9YEPzcI6ar N9hE1mGWTMJcwc/zOj3AKkYnc4w5+cPWNeNBIsM4= From: Mike Rapoport <rppt@kernel.org> To: linux-mm@kvack.org Cc: Andrew Morton <akpm@linux-foundation.org>, Anton Ivanov <anton.ivanov@cambridgegreys.com>, Arnd Bergmann <arnd@arndb.de>, "David S. Miller" <davem@davemloft.net>, Geert Uytterhoeven <geert@linux-m68k.org>, Greentime Hu <green.hu@gmail.com>, Greg Ungerer <gerg@linux-m68k.org>, Helge Deller <deller@gmx.de>, "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>, Jeff Dike <jdike@addtoit.com>, "Kirill A. Shutemov" <kirill@shutemov.name>, Linus Torvalds <torvalds@linux-foundation.org>, Mark Salter <msalter@redhat.com>, Matt Turner <mattst88@gmail.com>, Michal Simek <monstr@monstr.eu>, Peter Rosin <peda@axentia.se>, Richard Weinberger <richard@nod.at>, Rolf Eike Beer <eike-kernel@sf-tec.de>, Russell King <linux@armlinux.org.uk>, Sam Creasey <sammy@sammy.net>, Vincent Chen <deanbo422@gmail.com>, Vineet Gupta <Vineet.Gupta1@synopsys.com>, Mike Rapoport <rppt@kernel.org>, linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-parisc@vger.kernel.org, linux-um@lists.infradead.org, sparclinux@vger.kernel.org, Mike Rapoport <rppt@linux.ibm.com> Subject: [PATCH v3 04/13] m68k: nommu: use pgtable-nopud instead of 4level-fixup Date: Mon, 4 Nov 2019 08:56:18 +0200 Message-Id: <1572850587-20314-5-git-send-email-rppt@kernel.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1572850587-20314-1-git-send-email-rppt@kernel.org> References: <1572850587-20314-1-git-send-email-rppt@kernel.org> Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: <linux-parisc.vger.kernel.org> X-Mailing-List: linux-parisc@vger.kernel.org |
Series |
mm: remove __ARCH_HAS_4LEVEL_HACK
|
expand
|
diff --git a/arch/m68k/include/asm/pgtable_no.h b/arch/m68k/include/asm/pgtable_no.h index c18165b..ccc4568 100644 --- a/arch/m68k/include/asm/pgtable_no.h +++ b/arch/m68k/include/asm/pgtable_no.h @@ -2,7 +2,7 @@ #ifndef _M68KNOMMU_PGTABLE_H #define _M68KNOMMU_PGTABLE_H -#include <asm-generic/4level-fixup.h> +#include <asm-generic/pgtable-nopud.h> /* * (C) Copyright 2000-2002, Greg Ungerer <gerg@snapgear.com>