projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| cc90b958 BS |
1 | From: jbeulich@novell.com |
| 2 | Subject: ensure inadvertent uses of lazy TLB data are caught during the build | |
| 3 | Patch-mainline: obsolete | |
| 4 | ||
| 5 | Index: head-2008-11-17/arch/x86/kernel/cpu/common_64-xen.c | |
| 6 | =================================================================== | |
| 7 | --- head-2008-11-17.orig/arch/x86/kernel/cpu/common_64-xen.c 2008-11-17 14:06:21.000000000 +0100 | |
| 8 | +++ head-2008-11-17/arch/x86/kernel/cpu/common_64-xen.c 2008-11-17 14:07:10.000000000 +0100 | |
| 9 | @@ -557,8 +557,10 @@ void pda_init(int cpu) | |
| 10 | pda->irqcount = -1; | |
| 11 | pda->kernelstack = (unsigned long)stack_thread_info() - | |
| 12 | PDA_STACKOFFSET + THREAD_SIZE; | |
| 13 | +#ifndef CONFIG_XEN | |
| 14 | pda->active_mm = &init_mm; | |
| 15 | pda->mmu_state = 0; | |
| 16 | +#endif | |
| 17 | ||
| 18 | if (cpu == 0) { | |
| 19 | /* others are initialized in smpboot.c */ | |
| 20 | Index: head-2008-11-17/include/asm-x86/mach-xen/asm/tlbflush.h | |
| 21 | =================================================================== | |
| 22 | --- head-2008-11-17.orig/include/asm-x86/mach-xen/asm/tlbflush.h 2008-11-17 13:41:59.000000000 +0100 | |
| 23 | +++ head-2008-11-17/include/asm-x86/mach-xen/asm/tlbflush.h 2008-11-17 14:07:10.000000000 +0100 | |
| 24 | @@ -82,6 +82,7 @@ static inline void flush_tlb_range(struc | |
| 25 | flush_tlb_mm(vma->vm_mm); | |
| 26 | } | |
| 27 | ||
| 28 | +#ifndef CONFIG_XEN | |
| 29 | #define TLBSTATE_OK 1 | |
| 30 | #define TLBSTATE_LAZY 2 | |
| 31 | ||
| 32 | @@ -93,6 +94,7 @@ struct tlb_state { | |
| 33 | }; | |
| 34 | DECLARE_PER_CPU(struct tlb_state, cpu_tlbstate); | |
| 35 | #endif | |
| 36 | +#endif | |
| 37 | ||
| 38 | #endif /* SMP */ | |
| 39 | ||
| 40 | Index: head-2008-11-17/include/asm-x86/pda.h | |
| 41 | =================================================================== | |
| 42 | --- head-2008-11-17.orig/include/asm-x86/pda.h 2008-11-17 13:15:55.000000000 +0100 | |
| 43 | +++ head-2008-11-17/include/asm-x86/pda.h 2008-11-17 14:07:10.000000000 +0100 | |
| 44 | @@ -26,9 +26,13 @@ struct x8664_pda { | |
| 45 | short in_bootmem; /* pda lives in bootmem */ | |
| 46 | unsigned int __softirq_pending; | |
| 47 | unsigned int __nmi_count; /* number of NMI on this CPUs */ | |
| 48 | +#ifndef CONFIG_XEN | |
| 49 | short mmu_state; | |
| 50 | short isidle; | |
| 51 | struct mm_struct *active_mm; | |
| 52 | +#else | |
| 53 | + short isidle; | |
| 54 | +#endif | |
| 55 | unsigned apic_timer_irqs; | |
| 56 | unsigned irq0_irqs; | |
| 57 | unsigned irq_resched_count; |