From 46fa9020643607c66781ef8b373f0983ca4815fb Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 15 Oct 2012 16:04:30 +0200 Subject: [PATCH] generic memory layout: fix deps for [MALLOC|STACK]_BASE Defining STACK_BASE and MALLOC_BASE only makes sense when either CONFIG_MEMORY_LAYOUT_DEFAULT or CONFIG_MEMORY_LAYOUT_FIXED is set, so use separate #ifdefs instead ot #if/#else Signed-off-by: Sascha Hauer --- include/asm-generic/memory_layout.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/asm-generic/memory_layout.h b/include/asm-generic/memory_layout.h index eb1607f36..45e0ed802 100644 --- a/include/asm-generic/memory_layout.h +++ b/include/asm-generic/memory_layout.h @@ -2,15 +2,13 @@ #define __ASM_GENERIC_MEMORY_LAYOUT_H #ifdef CONFIG_MEMORY_LAYOUT_DEFAULT - #define MALLOC_BASE (TEXT_BASE - CONFIG_MALLOC_SIZE) #define STACK_BASE (TEXT_BASE - CONFIG_MALLOC_SIZE - CONFIG_STACK_SIZE) +#endif -#else - +#ifdef CONFIG_MEMORY_LAYOUT_FIXED #define STACK_BASE CONFIG_STACK_BASE #define MALLOC_BASE CONFIG_MALLOC_BASE - #endif #define HEAD_TEXT_BASE MALLOC_BASE