Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[pandora-kernel.git] / include / asm-mips / mmu_context.h

diff --git a/include/asm-mips/mmu_context.h b/include/asm-mips/mmu_context.h
index 6e09f4c..fe065d6 100644 (file)
--- a/include/asm-mips/mmu_context.h
+++ b/include/asm-mips/mmu_context.h
@@ -11,7 +11,6 @@
 #ifndef _ASM_MMU_CONTEXT_H
 #define _ASM_MMU_CONTEXT_H
 
-#include <linux/config.h>
 #include <linux/errno.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
@@ -263,10 +262,10 @@ drop_mmu_context(struct mm_struct *mm, unsigned cpu)
                /* See comments for similar code above */
                prevvpe = dvpe();
                oldasid = (read_c0_entryhi() & ASID_MASK);
-               if(smtc_live_asid[mytlb][oldasid]) {
-                 smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu);
-                 if(smtc_live_asid[mytlb][oldasid] == 0)
-                       smtc_flush_tlb_asid(oldasid);
+               if (smtc_live_asid[mytlb][oldasid]) {
+                       smtc_live_asid[mytlb][oldasid] &= ~(0x1 << cpu);
+                       if(smtc_live_asid[mytlb][oldasid] == 0)
+                               smtc_flush_tlb_asid(oldasid);
                }
                /* See comments for similar code above */
                write_c0_entryhi((read_c0_entryhi() & ~HW_ASID_MASK)