3d1712c91d
While working on these patch set, I found several possible cleanup on x86-64 and ia64. akpm: I stole this from Andi's queue. Not only does it clean up bitops. It also unrelatedly changes the prototype of pci_mmcfg_init() and removes its arch_initcall(). It seems that the wrong two patches got joined together, but this is the one which has been tested. This patch fixes the current x86_64 build error (the pci_mmcfg_init() declaration in arch/i386/pci/pci.h disagrees with the definition in arch/x86_64/pci/mmconfig.c) This also means that x86_64's pci_mmcfg_init() gets called in the same (new) manner as x86's: from arch/i386/pci/init.c:pci_access_init(), rather than via initcall. The bitops cleanups came along for free. All this worked OK in -mm testing (since 2.6.16-rc4-mm1) because x86_64 was tested with both patches applied. Signed-off-by: Akinobu Mita <mita@miraclelinux.com> Signed-off-by: Andi Kleen <ak@suse.de> Cc: Con Kolivas <kernel@kolivas.org> Cc: Jean Delvare <khali@linux-fr.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
74 lines
1.8 KiB
C
74 lines
1.8 KiB
C
#ifndef __X86_64_MMU_CONTEXT_H
|
|
#define __X86_64_MMU_CONTEXT_H
|
|
|
|
#include <linux/config.h>
|
|
#include <asm/desc.h>
|
|
#include <asm/atomic.h>
|
|
#include <asm/pgalloc.h>
|
|
#include <asm/pda.h>
|
|
#include <asm/pgtable.h>
|
|
#include <asm/tlbflush.h>
|
|
|
|
/*
|
|
* possibly do the LDT unload here?
|
|
*/
|
|
int init_new_context(struct task_struct *tsk, struct mm_struct *mm);
|
|
void destroy_context(struct mm_struct *mm);
|
|
|
|
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
|
|
{
|
|
#ifdef CONFIG_SMP
|
|
if (read_pda(mmu_state) == TLBSTATE_OK)
|
|
write_pda(mmu_state, TLBSTATE_LAZY);
|
|
#endif
|
|
}
|
|
|
|
static inline void load_cr3(pgd_t *pgd)
|
|
{
|
|
asm volatile("movq %0,%%cr3" :: "r" (__pa(pgd)) : "memory");
|
|
}
|
|
|
|
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
|
|
struct task_struct *tsk)
|
|
{
|
|
unsigned cpu = smp_processor_id();
|
|
if (likely(prev != next)) {
|
|
/* stop flush ipis for the previous mm */
|
|
cpu_clear(cpu, prev->cpu_vm_mask);
|
|
#ifdef CONFIG_SMP
|
|
write_pda(mmu_state, TLBSTATE_OK);
|
|
write_pda(active_mm, next);
|
|
#endif
|
|
cpu_set(cpu, next->cpu_vm_mask);
|
|
load_cr3(next->pgd);
|
|
|
|
if (unlikely(next->context.ldt != prev->context.ldt))
|
|
load_LDT_nolock(&next->context, cpu);
|
|
}
|
|
#ifdef CONFIG_SMP
|
|
else {
|
|
write_pda(mmu_state, TLBSTATE_OK);
|
|
if (read_pda(active_mm) != next)
|
|
out_of_line_bug();
|
|
if (!cpu_test_and_set(cpu, next->cpu_vm_mask)) {
|
|
/* We were in lazy tlb mode and leave_mm disabled
|
|
* tlb flush IPI delivery. We must reload CR3
|
|
* to make sure to use no freed page tables.
|
|
*/
|
|
load_cr3(next->pgd);
|
|
load_LDT_nolock(&next->context, cpu);
|
|
}
|
|
}
|
|
#endif
|
|
}
|
|
|
|
#define deactivate_mm(tsk,mm) do { \
|
|
load_gs_index(0); \
|
|
asm volatile("movl %0,%%fs"::"r"(0)); \
|
|
} while(0)
|
|
|
|
#define activate_mm(prev, next) \
|
|
switch_mm((prev),(next),NULL)
|
|
|
|
|
|
#endif
|