diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 16:18:26 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 18:06:53 +0200 |
commit | 0962f402af1bb0b53ccee626785d202a10c12fff (patch) | |
tree | 26fa57193f16e45c6e0557049d02164f129077ed /include/asm-x86/pgtable.h | |
parent | Merge branch 'x86/pebs' into x86-v28-for-linus-phase1 (diff) | |
parent | Merge commit 'v2.6.27-rc3' into x86/prototypes (diff) | |
download | linux-0962f402af1bb0b53ccee626785d202a10c12fff.tar.xz linux-0962f402af1bb0b53ccee626785d202a10c12fff.zip |
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) {} static inline void native_pagetable_setup_done(pgd_t *base) {} #endif +extern int arch_report_meminfo(char *page); + #ifdef CONFIG_PARAVIRT #include <asm/paravirt.h> #else /* !CONFIG_PARAVIRT */ |