浏览代码

asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies

Simplify the dependencies on __mem{init,exit}* (ACPI_HOTPLUG_MEMORY requires
MEMORY_HOTPLUG).

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Adrian Bunk 17 年之前
父节点
当前提交
1a3fb6d481
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      include/asm-generic/vmlinux.lds.h

+ 1 - 2
include/asm-generic/vmlinux.lds.h

@@ -29,8 +29,7 @@
 #define CPU_DISCARD(sec) *(.cpu##sec)
 #endif
 
-#if defined(CONFIG_MEMORY_HOTPLUG) || defined(CONFIG_ACPI_HOTPLUG_MEMORY) \
-	|| defined(CONFIG_ACPI_HOTPLUG_MEMORY_MODULE)
+#if defined(CONFIG_MEMORY_HOTPLUG)
 #define MEM_KEEP(sec)    *(.mem##sec)
 #define MEM_DISCARD(sec)
 #else