aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/Kconfig1
-rw-r--r--arch/x86/include/asm/memblock.h2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 97f08941dd7..28116d4f7b6 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -26,6 +26,7 @@ config X86
26 select HAVE_KPROBES 26 select HAVE_KPROBES
27 select HAVE_MEMBLOCK 27 select HAVE_MEMBLOCK
28 select HAVE_MEMBLOCK_NODE_MAP 28 select HAVE_MEMBLOCK_NODE_MAP
29 select ARCH_DISCARD_MEMBLOCK
29 select ARCH_WANT_OPTIONAL_GPIOLIB 30 select ARCH_WANT_OPTIONAL_GPIOLIB
30 select ARCH_WANT_FRAME_POINTERS 31 select ARCH_WANT_FRAME_POINTERS
31 select HAVE_DMA_ATTRS 32 select HAVE_DMA_ATTRS
diff --git a/arch/x86/include/asm/memblock.h b/arch/x86/include/asm/memblock.h
index 17a882e90ad..bc5667081ae 100644
--- a/arch/x86/include/asm/memblock.h
+++ b/arch/x86/include/asm/memblock.h
@@ -1,8 +1,6 @@
1#ifndef _X86_MEMBLOCK_H 1#ifndef _X86_MEMBLOCK_H
2#define _X86_MEMBLOCK_H 2#define _X86_MEMBLOCK_H
3 3
4#define ARCH_DISCARD_MEMBLOCK
5
6void memblock_x86_reserve_range(u64 start, u64 end, char *name); 4void memblock_x86_reserve_range(u64 start, u64 end, char *name);
7void memblock_x86_free_range(u64 start, u64 end); 5void memblock_x86_free_range(u64 start, u64 end);
8 6