git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into tracing/hw-breakpoints
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
processor.h
diff --git
a/arch/x86/include/asm/processor.h
b/arch/x86/include/asm/processor.h
index
448b34a
..
2b03f70
100644
(file)
--- a/
arch/x86/include/asm/processor.h
+++ b/
arch/x86/include/asm/processor.h
@@
-136,7
+136,8
@@
extern struct cpuinfo_x86 boot_cpu_data;
extern struct cpuinfo_x86 new_cpu_data;
extern struct tss_struct doublefault_tss;
extern struct cpuinfo_x86 new_cpu_data;
extern struct tss_struct doublefault_tss;
-extern __u32 cleared_cpu_caps[NCAPINTS];
+extern __u32 cpu_caps_cleared[NCAPINTS];
+extern __u32 cpu_caps_set[NCAPINTS];
#ifdef CONFIG_SMP
DECLARE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
#ifdef CONFIG_SMP
DECLARE_PER_CPU_SHARED_ALIGNED(struct cpuinfo_x86, cpu_info);
@@
-410,9
+411,6
@@
DECLARE_PER_CPU(unsigned long, stack_canary);
extern unsigned int xstate_size;
extern void free_thread_xstate(struct task_struct *);
extern struct kmem_cache *task_xstate_cachep;
extern unsigned int xstate_size;
extern void free_thread_xstate(struct task_struct *);
extern struct kmem_cache *task_xstate_cachep;
-extern void init_scattered_cpuid_features(struct cpuinfo_x86 *c);
-extern unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c);
-extern unsigned short num_cache_leaves;
struct thread_struct {
/* Cached TLS descriptors: */
struct thread_struct {
/* Cached TLS descriptors: */
@@
-428,8
+426,12
@@
struct thread_struct {
unsigned short fsindex;
unsigned short gsindex;
#endif
unsigned short fsindex;
unsigned short gsindex;
#endif
+#ifdef CONFIG_X86_32
unsigned long ip;
unsigned long ip;
+#endif
+#ifdef CONFIG_X86_64
unsigned long fs;
unsigned long fs;
+#endif
unsigned long gs;
/* Hardware debugging registers: */
unsigned long debugreg[HBP_NUM];
unsigned long gs;
/* Hardware debugging registers: */
unsigned long debugreg[HBP_NUM];
@@
-835,6
+837,7
@@
extern unsigned int BIOS_revision;
/* Boot loader type from the setup header: */
extern int bootloader_type;
/* Boot loader type from the setup header: */
extern int bootloader_type;
+extern int bootloader_version;
extern char ignore_fpu_irq;
extern char ignore_fpu_irq;
@@
-895,7
+898,6
@@
static inline void spin_lock_prefetch(const void *x)
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
.io_bitmap_ptr = NULL, \
.vm86_info = NULL, \
.sysenter_cs = __KERNEL_CS, \
.io_bitmap_ptr = NULL, \
- .fs = __KERNEL_PERCPU, \
}
/*
}
/*