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_32.h | |
| parent | 19268ed7449c561694d048a34601a30e2d1aaf79 (diff) | |
| parent | 8d7ccaa545490cdffdfaff0842436a8dd85cf47b (diff) | |
| download | op-kernel-dev-0962f402af1bb0b53ccee626785d202a10c12fff.zip op-kernel-dev-0962f402af1bb0b53ccee626785d202a10c12fff.tar.gz | |
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_32.h')
| -rw-r--r-- | include/asm-x86/pgtable_32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h index bbc136f..45c8235 100644 --- a/include/asm-x86/pgtable_32.h +++ b/include/asm-x86/pgtable_32.h @@ -31,6 +31,7 @@ static inline void pgtable_cache_init(void) { } static inline void check_pgt_cache(void) { } void paging_init(void); +extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); /* * The Linux x86 paging architecture is 'compile-time dual-mode', it |
