Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6

[mv-sheeva.git] / include / asm-arm / mmu.h

diff --git a/include/asm-arm/mmu.h b/include/asm-arm/mmu.h
index 23dde52e0945f31c24ddd9fc4ddc1b8e66a74163..53099d4ee4211d072741841a6513aebf74161a54 100644 (file)
--- a/include/asm-arm/mmu.h
+++ b/include/asm-arm/mmu.h
@@ -4,12 +4,13 @@
 #ifdef CONFIG_MMU
 
 typedef struct {
-#if __LINUX_ARM_ARCH__ >= 6
+#ifdef CONFIG_CPU_HAS_ASID
        unsigned int id;
 #endif
+       unsigned int kvm_seq;
 } mm_context_t;
 
-#if __LINUX_ARM_ARCH__ >= 6
+#ifdef CONFIG_CPU_HAS_ASID
 #define ASID(mm)       ((mm)->context.id & 255)
 #else
 #define ASID(mm)       (0)