diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 12:47:28 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-11 12:47:28 -0400 |
| commit | baadac8b10c5ac15ce3d26b68fa266c8889b163f (patch) | |
| tree | 8ab1c758f8b2fe21351102d9845c0f8ec81a52cf /include | |
| parent | 051a82fc0c450f6ca649acf684586477aa6d5c6a (diff) | |
| parent | 985a34bd75cc8c96e43f00dcdda7c3fdb51a3026 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: remove quicklists
x86: ia32 syscall restart fix
x86: ioremap, remove WARN_ON()
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86/pgtable_32.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h index a842c7222b1e..4e6a0fca0b47 100644 --- a/include/asm-x86/pgtable_32.h +++ b/include/asm-x86/pgtable_32.h | |||
| @@ -26,10 +26,9 @@ struct mm_struct; | |||
| 26 | struct vm_area_struct; | 26 | struct vm_area_struct; |
| 27 | 27 | ||
| 28 | extern pgd_t swapper_pg_dir[1024]; | 28 | extern pgd_t swapper_pg_dir[1024]; |
| 29 | extern struct kmem_cache *pmd_cache; | ||
| 30 | void check_pgt_cache(void); | ||
| 31 | 29 | ||
| 32 | static inline void pgtable_cache_init(void) {} | 30 | static inline void pgtable_cache_init(void) { } |
| 31 | static inline void check_pgt_cache(void) { } | ||
| 33 | void paging_init(void); | 32 | void paging_init(void); |
| 34 | 33 | ||
| 35 | 34 | ||