diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:18:26 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 12:06:53 -0400 |
| commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
| tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/pgtable.h | |
| parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1
Conflicts:
arch/x86/kernel/process_32.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/pgtable.h')
| -rw-r--r-- | include/asm-x86/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h index 70fcb2adbb71..57d919a2d79d 100644 --- a/include/asm-x86/pgtable.h +++ b/include/asm-x86/pgtable.h | |||
| @@ -313,6 +313,8 @@ static inline void native_pagetable_setup_start(pgd_t *base) {} | |||
| 313 | static inline void native_pagetable_setup_done(pgd_t *base) {} | 313 | static inline void native_pagetable_setup_done(pgd_t *base) {} |
| 314 | #endif | 314 | #endif |
| 315 | 315 | ||
| 316 | extern int arch_report_meminfo(char *page); | ||
| 317 | |||
| 316 | #ifdef CONFIG_PARAVIRT | 318 | #ifdef CONFIG_PARAVIRT |
| 317 | #include <asm/paravirt.h> | 319 | #include <asm/paravirt.h> |
| 318 | #else /* !CONFIG_PARAVIRT */ | 320 | #else /* !CONFIG_PARAVIRT */ |