Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / arch / mips / include / asm / cpu-info.h

diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h
index d43b3045109ec544d89ab33a30463eb230357b26..cd6efb07c9808594c143d16fcc005c2ce9afb0ea 100644 (file)
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -32,6 +32,7 @@ struct guest_info {
        unsigned long           ases_dyn;
        unsigned long long      options;
        unsigned long long      options_dyn;
+       int                     tlbsize;
        u8                      conf;
        u8                      kscratch_mask;
 };
@@ -108,6 +109,7 @@ struct cpuinfo_mips {
        struct guest_info       guest;
        unsigned int            gtoffset_mask;
        unsigned int            guestid_mask;
+       unsigned int            guestid_cache;
 } __attribute__((aligned(SMP_CACHE_BYTES)));
 
 extern struct cpuinfo_mips cpu_data[];