From patchwork Fri Dec 2 15:05:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Murzin X-Patchwork-Id: 9458669 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A0B4F60236 for ; Fri, 2 Dec 2016 15:09:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93FC72847C for ; Fri, 2 Dec 2016 15:09:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88DA92855C; Fri, 2 Dec 2016 15:09:17 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1363B2847C for ; Fri, 2 Dec 2016 15:09:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCpR7-0005YN-U7; Fri, 02 Dec 2016 15:07:41 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCpPl-0004fa-UB for linux-arm-kernel@lists.infradead.org; Fri, 02 Dec 2016 15:06:23 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F225215A1; Fri, 2 Dec 2016 07:06:00 -0800 (PST) Received: from bc-a7-1-1.euhpc.arm.com. (bc-a7-1-1.euhpc.arm.com [10.6.3.165]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 61E233F24D; Fri, 2 Dec 2016 07:06:00 -0800 (PST) From: Vladimir Murzin To: linux-arm-kernel@lists.infradead.org Subject: [RFC v3 PATCH 04/25] ARM: NOMMU: define SECTION_xxx macros Date: Fri, 2 Dec 2016 15:05:22 +0000 Message-Id: <1480691143-19845-5-git-send-email-vladimir.murzin@arm.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1480691143-19845-1-git-send-email-vladimir.murzin@arm.com> References: <1480691143-19845-1-git-send-email-vladimir.murzin@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161202_070618_240273_6138E057 X-CRM114-Status: UNSURE ( 6.70 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Russell King , arnd@arndb.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP SECTION_SIZE is referenced from several places which breaks NOMMU build: CC arch/arm/kernel/setup.o arch/arm/kernel/setup.c: In function 'reserve_crashkernel': arch/arm/kernel/setup.c:1001:25: error: 'SECTION_SIZE' undeclared (first use in this function) crash_size, SECTION_SIZE); ^ arch/arm/kernel/setup.c:1001:25: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [arch/arm/kernel/setup.o] Error 1 make: *** [arch/arm/kernel] Error 2 ... In file included from ./include/linux/cache.h:4:0, from ./include/linux/printk.h:8, from ./include/linux/kernel.h:13, from arch/arm/mach-omap2/omap-secure.c:15: arch/arm/mach-omap2/omap-secure.c: In function 'omap_secure_ram_reserve_memblock': arch/arm/mach-omap2/omap-secure.c:65:21: error: 'SECTION_SIZE' undeclared (first use in this function) size = ALIGN(size, SECTION_SIZE); ^ ./include/uapi/linux/kernel.h:10:47: note: in definition of macro '__ALIGN_KERNEL_MASK' #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) ^ ./include/linux/kernel.h:48:22: note: in expansion of macro '__ALIGN_KERNEL' #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ^ arch/arm/mach-omap2/omap-secure.c:65:9: note: in expansion of macro 'ALIGN' size = ALIGN(size, SECTION_SIZE); ^ arch/arm/mach-omap2/omap-secure.c:65:21: note: each undeclared identifier is reported only once for each function it appears in size = ALIGN(size, SECTION_SIZE); ^ ./include/uapi/linux/kernel.h:10:47: note: in definition of macro '__ALIGN_KERNEL_MASK' #define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) ^ ./include/linux/kernel.h:48:22: note: in expansion of macro '__ALIGN_KERNEL' #define ALIGN(x, a) __ALIGN_KERNEL((x), (a)) ^ arch/arm/mach-omap2/omap-secure.c:65:9: note: in expansion of macro 'ALIGN' size = ALIGN(size, SECTION_SIZE); ^ make[1]: *** [arch/arm/mach-omap2/omap-secure.o] Error 1 ... In file included from arch/arm/mach-tegra/io.c:31:0: arch/arm/mach-tegra/iomap.h:116:22: error: 'SECTION_SIZE' undeclared here (not in a function) #define IO_PPSB_SIZE SECTION_SIZE ^ arch/arm/mach-tegra/io.c:37:13: note: in expansion of macro 'IO_PPSB_SIZE' .length = IO_PPSB_SIZE, ^ arch/arm/mach-tegra/io.c:33:24: warning: 'tegra_io_desc' defined but not used [-Wunused-variable] static struct map_desc tegra_io_desc[] __initdata = { ^ make[1]: *** [arch/arm/mach-tegra/io.o] Error 1 make: *** [arch/arm/mach-tegra] Error 2 Pickup defines from pgtable-2level.h to make NOMMU build happy. Cc: Russell King Signed-off-by: Vladimir Murzin --- arch/arm/include/asm/pgtable-nommu.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h index add094d..9115801 100644 --- a/arch/arm/include/asm/pgtable-nommu.h +++ b/arch/arm/include/asm/pgtable-nommu.h @@ -35,6 +35,11 @@ #define PGDIR_SIZE (1UL << PGDIR_SHIFT) #define PGDIR_MASK (~(PGDIR_SIZE-1)) + +#define SECTION_SHIFT 20 +#define SECTION_SIZE (1UL << SECTION_SHIFT) +#define SECTION_MASK (~(SECTION_SIZE-1)) + /* FIXME */ #define PAGE_NONE __pgprot(0)