diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 12:52:30 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 12:52:30 -0400 |
| commit | 6d21491838a2a9f22843c7530b118596ee9f4d77 (patch) | |
| tree | 9dcd7a4009d219092c391454efc3dd29b23f52d7 /arch/x86/include | |
| parent | c9b8af00ff71f86ff3d092cc60ca673e1d0eae5b (diff) | |
| parent | 8429db5c6336083594036c30f49401405d536911 (diff) | |
Merge branch 'topic/slab/earlyboot-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'topic/slab/earlyboot-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
slab: setup cpu caches later on when interrupts are enabled
slab,slub: don't enable interrupts during early boot
slab: fix gfp flag in setup_cpu_cache()
x86: make zap_low_mapping could be used early
irq: slab alloc for default irq_affinity
memcg: fix page_cgroup fatal error in FLATMEM
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/tlbflush.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index a5ecc9c33e92..7f3eba08e7de 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h | |||
| @@ -172,6 +172,6 @@ static inline void flush_tlb_kernel_range(unsigned long start, | |||
| 172 | flush_tlb_all(); | 172 | flush_tlb_all(); |
| 173 | } | 173 | } |
| 174 | 174 | ||
| 175 | extern void zap_low_mappings(void); | 175 | extern void zap_low_mappings(bool early); |
| 176 | 176 | ||
| 177 | #endif /* _ASM_X86_TLBFLUSH_H */ | 177 | #endif /* _ASM_X86_TLBFLUSH_H */ |