forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'x86/paravirt' into x86/apic

Browse source 
Conflicts:
	arch/x86/mach-voyager/voyager_smp.c
This commit is contained in:
Ingo Molnar 2009-02-09 12:16:59 +01:00
commit eca217b36e
27 changed files with 1401 additions and 1169 deletions
Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/include/asm/processor.h
View file

@ -768,7 +768,8 @@ extern int sysenter_setup(void);
extern struct desc_ptr early_gdt_descr;
extern void cpu_set_gdt(int);
extern void switch_to_new_gdt(void);
extern void switch_to_new_gdt(int);
extern void load_percpu_segment(int);
extern void cpu_init(void);
static inline unsigned long get_debugctlmsr(void)