git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.3
[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
934828c
..
b42eec0
100644
(file)
--- a/
include/asm-x86_64/processor.h
+++ b/
include/asm-x86_64/processor.h
@@
-18,6
+18,7
@@
#include <asm/current.h>
#include <asm/system.h>
#include <asm/mmsegment.h>
#include <asm/current.h>
#include <asm/system.h>
#include <asm/mmsegment.h>
+#include <asm/percpu.h>
#include <linux/personality.h>
#define TF_MASK 0x00000100
#include <linux/personality.h>
#define TF_MASK 0x00000100
@@
-60,6
+61,8
@@
struct cpuinfo_x86 {
int x86_cache_alignment;
int x86_tlbsize; /* number of 4K pages in DTLB/ITLB combined(in pages)*/
__u8 x86_virt_bits, x86_phys_bits;
int x86_cache_alignment;
int x86_tlbsize; /* number of 4K pages in DTLB/ITLB combined(in pages)*/
__u8 x86_virt_bits, x86_phys_bits;
+ __u8 x86_num_cores;
+ __u8 x86_apicid;
__u32 x86_power;
unsigned long loops_per_jiffy;
} ____cacheline_aligned;
__u32 x86_power;
unsigned long loops_per_jiffy;
} ____cacheline_aligned;
@@
-75,14
+78,11
@@
struct cpuinfo_x86 {
#define X86_VENDOR_NUM 8
#define X86_VENDOR_UNKNOWN 0xff
#define X86_VENDOR_NUM 8
#define X86_VENDOR_UNKNOWN 0xff
-extern struct cpuinfo_x86 boot_cpu_data;
-extern struct tss_struct init_tss[NR_CPUS];
-
#ifdef CONFIG_SMP
extern struct cpuinfo_x86 cpu_data[];
#define current_cpu_data cpu_data[smp_processor_id()]
#else
#ifdef CONFIG_SMP
extern struct cpuinfo_x86 cpu_data[];
#define current_cpu_data cpu_data[smp_processor_id()]
#else
-#define cpu_data
&boot_cpu_data
+#define cpu_data
(&boot_cpu_data)
#define current_cpu_data boot_cpu_data
#endif
#define current_cpu_data boot_cpu_data
#endif
@@
-227,6
+227,9
@@
struct tss_struct {
unsigned long io_bitmap[IO_BITMAP_LONGS + 1];
} __attribute__((packed)) ____cacheline_aligned;
unsigned long io_bitmap[IO_BITMAP_LONGS + 1];
} __attribute__((packed)) ____cacheline_aligned;
+extern struct cpuinfo_x86 boot_cpu_data;
+DECLARE_PER_CPU(struct tss_struct,init_tss);
+
#define ARCH_MIN_TASKALIGN 16
struct thread_struct {
#define ARCH_MIN_TASKALIGN 16
struct thread_struct {
@@
-251,6
+254,7
@@
struct thread_struct {
switch faster for a limited number of ioperm using tasks. -AK */
int ioperm;
unsigned long *io_bitmap_ptr;
switch faster for a limited number of ioperm using tasks. -AK */
int ioperm;
unsigned long *io_bitmap_ptr;
+ unsigned io_bitmap_max;
/* cached TLS descriptors. */
u64 tls_array[GDT_ENTRY_TLS_ENTRIES];
} __attribute__((aligned(16)));
/* cached TLS descriptors. */
u64 tls_array[GDT_ENTRY_TLS_ENTRIES];
} __attribute__((aligned(16)));
@@
-456,9
+460,4
@@
static inline void __mwait(unsigned long eax, unsigned long ecx)
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)
#define cache_line_size() (boot_cpu_data.x86_cache_alignment)
-#ifdef CONFIG_SCHED_SMT
-#define ARCH_HAS_SCHED_DOMAIN
-#define ARCH_HAS_SCHED_WAKE_IDLE
-#endif
-
#endif /* __ASM_X86_64_PROCESSOR_H */
#endif /* __ASM_X86_64_PROCESSOR_H */