Merge branch '3.16-fixes' into mips-for-linux-next

[cascardo/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 47d5967..d5f42c1 100644 (file)
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -44,8 +44,8 @@ struct cpuinfo_mips {
        /*
         * Capability and feature descriptor structure for MIPS CPU
         */
-       unsigned long           options;
        unsigned long           ases;
+       unsigned long long      options;
        unsigned int            udelay_val;
        unsigned int            processor_id;
        unsigned int            fpu_id;
@@ -61,6 +61,7 @@ struct cpuinfo_mips {
        struct cache_desc       scache; /* Secondary cache */
        struct cache_desc       tcache; /* Tertiary/split secondary cache */
        int                     srsets; /* Shadow register sets */
+       int                     package;/* physical package number */
        int                     core;   /* physical core number */
 #ifdef CONFIG_64BIT
        int                     vmbits; /* Virtual memory size in bits */
@@ -115,7 +116,7 @@ struct proc_cpuinfo_notifier_args {
 #ifdef CONFIG_MIPS_MT_SMP
 # define cpu_vpe_id(cpuinfo)   ((cpuinfo)->vpe_id)
 #else
-# define cpu_vpe_id(cpuinfo)   0
+# define cpu_vpe_id(cpuinfo)   ({ (void)cpuinfo; 0; })
 #endif
 
 #endif /* __ASM_CPU_INFO_H */