diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 15:52:45 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 15:52:45 -0500 |
| commit | 0edcf8d6926f4038443dbc24e319530177ca0353 (patch) | |
| tree | 6010af62f73d01ab673d5106f310eaf4f4228e32 /arch/x86/include/asm/pgtable.h | |
| parent | 87b203079ed949de52f0d92aeae20e5e0116c12f (diff) | |
| parent | 40150d37be7f7949b2ec07d511244da856647d84 (diff) | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts:
arch/x86/include/asm/pgtable.h
Diffstat (limited to 'arch/x86/include/asm/pgtable.h')
| -rw-r--r-- | arch/x86/include/asm/pgtable.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 1c097a3a6669..d0812e155f1d 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h | |||
| @@ -288,6 +288,8 @@ static inline int is_new_memtype_allowed(unsigned long flags, | |||
| 288 | return 1; | 288 | return 1; |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | pmd_t *populate_extra_pmd(unsigned long vaddr); | ||
| 292 | pte_t *populate_extra_pte(unsigned long vaddr); | ||
| 291 | #endif /* __ASSEMBLY__ */ | 293 | #endif /* __ASSEMBLY__ */ |
| 292 | 294 | ||
| 293 | #ifdef CONFIG_X86_32 | 295 | #ifdef CONFIG_X86_32 |