aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/setup.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/asm-x86/setup.h')
-rw-r--r--include/asm-x86/setup.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
index 24d786e07b4..071e054abd8 100644
--- a/include/asm-x86/setup.h
+++ b/include/asm-x86/setup.h
@@ -3,6 +3,13 @@
3 3
4#define COMMAND_LINE_SIZE 2048 4#define COMMAND_LINE_SIZE 2048
5 5
6#ifndef __ASSEMBLY__
7char *machine_specific_memory_setup(void);
8#ifndef CONFIG_PARAVIRT
9#define paravirt_post_allocator_init() do {} while (0)
10#endif
11#endif /* __ASSEMBLY__ */
12
6#ifdef __KERNEL__ 13#ifdef __KERNEL__
7 14
8#ifdef __i386__ 15#ifdef __i386__
@@ -51,9 +58,7 @@ void __init add_memory_region(unsigned long long start,
51 58
52extern unsigned long init_pg_tables_end; 59extern unsigned long init_pg_tables_end;
53 60
54#ifndef CONFIG_PARAVIRT 61
55#define paravirt_post_allocator_init() do {} while (0)
56#endif
57 62
58#endif /* __i386__ */ 63#endif /* __i386__ */
59#endif /* _SETUP */ 64#endif /* _SETUP */