diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-09 22:27:33 -0700 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /arch/x86/include/asm/pgtable_32.h | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
| download | kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.zip kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.tar.gz kernel_samsung_smdk4412-e548833df83c3554229eff0672900bfe958b45fd.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'arch/x86/include/asm/pgtable_32.h')
| -rw-r--r-- | arch/x86/include/asm/pgtable_32.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h index 2984a25..f686f49 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h @@ -26,6 +26,7 @@ struct mm_struct; struct vm_area_struct; extern pgd_t swapper_pg_dir[1024]; +extern pgd_t trampoline_pg_dir[1024]; static inline void pgtable_cache_init(void) { } static inline void check_pgt_cache(void) { } |