From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yh0-f44.google.com (mail-yh0-f44.google.com [209.85.213.44]) by kanga.kvack.org (Postfix) with ESMTP id 021646B0035 for ; Tue, 10 Dec 2013 14:30:11 -0500 (EST) Received: by mail-yh0-f44.google.com with SMTP id f64so4230679yha.3 for ; Tue, 10 Dec 2013 11:30:11 -0800 (PST) Received: from comal.ext.ti.com (comal.ext.ti.com. [198.47.26.152]) by mx.google.com with ESMTPS id hd1si5675674qcb.89.2013.12.10.11.30.10 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 10 Dec 2013 11:30:11 -0800 (PST) From: Santosh Shilimkar Subject: [PATCH 2/2] mm/memblock: fix buld of "cris" arch Date: Tue, 10 Dec 2013 14:29:58 -0500 Message-ID: <1386703798-26521-3-git-send-email-santosh.shilimkar@ti.com> In-Reply-To: <1386703798-26521-1-git-send-email-santosh.shilimkar@ti.com> References: <1386703798-26521-1-git-send-email-santosh.shilimkar@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: owner-linux-mm@kvack.org List-ID: To: akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Grygorii Strashko , Yinghai Lu , Tejun Heo , Santosh Shilimkar From: Grygorii Strashko The build of "criss" arch is broken after applying new memblock API series. In file included from arch/cris/mm/init.c:13:0: include/linux/bootmem.h: In function 'memblock_virt_alloc': include/linux/bootmem.h:229:55: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h:229:55: note: each undeclared identifier is reported only once for each function it appears in include/linux/bootmem.h: In function 'memblock_virt_alloc_nopanic': include/linux/bootmem.h:237:63: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h: In function 'memblock_virt_alloc_node': include/linux/bootmem.h:250:27: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h: In function 'memblock_virt_alloc_node_nopanic': include/linux/bootmem.h:258:28: error: 'KSEG_C' undeclared (first use in this function) In file included from mm/bootmem.c:14:0: include/linux/bootmem.h: In function 'memblock_virt_alloc': include/linux/bootmem.h:229:55: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h:229:55: note: each undeclared identifier is reported only once for each function it appears in include/linux/bootmem.h: In function 'memblock_virt_alloc_nopanic': include/linux/bootmem.h:237:63: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h: In function 'memblock_virt_alloc_node': include/linux/bootmem.h:250:27: error: 'KSEG_C' undeclared (first use in this function) The "cris" arch defines memory parameters in a different manner than other arch's and they are splitted between 2 headers: and As result, now build is failed if "bootmem.h" included before and . Hence, fix it by including additional header in bootmem.h. Cc: Yinghai Lu Cc: Tejun Heo Cc: Andrew Morton Signed-off-by: Grygorii Strashko Signed-off-by: Santosh Shilimkar --- include/linux/bootmem.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 1c9aa0e..2fae55d 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h @@ -5,6 +5,7 @@ #define _LINUX_BOOTMEM_H #include +#include #include /* -- 1.7.9.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org