vserver 1.9.5.x5

[linux-2.6.git] / include / asm-x86_64 / processor.h

diff --git a/include/asm-x86_64/processor.h b/include/asm-x86_64/processor.h
index b42eec0..6dadc64 100644 (file)
--- a/include/asm-x86_64/processor.h
+++ b/include/asm-x86_64/processor.h
@@ -64,6 +64,7 @@ struct cpuinfo_x86 {
        __u8    x86_num_cores;
        __u8    x86_apicid;
         __u32   x86_power;     
+       __u32   x86_cpuid_level;        /* Max CPUID function supported */
        unsigned long loops_per_jiffy;
 } ____cacheline_aligned;
 
@@ -90,6 +91,7 @@ extern char ignore_irq13;
 
 extern void identify_cpu(struct cpuinfo_x86 *);
 extern void print_cpu_info(struct cpuinfo_x86 *);
+extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
 extern void dodgy_tsc(void);
 
 /*
@@ -156,17 +158,11 @@ static inline void clear_in_cr4 (unsigned long mask)
                :"ax");
 }
 
-/*
- * Bus types
- */
-#define MCA_bus 0
-#define MCA_bus__is_a_macro
-
 
 /*
- * User space process size: 512GB - 1GB (default).
+ * User space process size. 47bits.
  */
-#define TASK_SIZE      (0x0000007fc0000000UL)
+#define TASK_SIZE      (0x800000000000UL)
 
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
@@ -460,4 +456,8 @@ static inline void __mwait(unsigned long eax, unsigned long ecx)
 
 #define cache_line_size() (boot_cpu_data.x86_cache_alignment)
 
+extern unsigned long boot_option_idle_override;
+/* Boot loader type from the setup header */
+extern int bootloader_type;
+
 #endif /* __ASM_X86_64_PROCESSOR_H */