iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers

Browse Source 
Conflicts:
	arch/x86/include/asm/page.h
	arch/x86/include/asm/pgtable.h
	arch/x86/mach-voyager/voyager_smp.c
	arch/x86/mm/fault.c
This commit is contained in:
Ingo Molnar
2009-02-13 13:09:00 +01:00
parent d040c1614c 54321d947a
commit b233969eaa
19 changed files with 876 additions and 698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/processor.h
View File

@ -16,6 +16,7 @@ struct mm_struct;
#include <asm/cpufeature.h>
#include <asm/system.h>
#include <asm/page.h>
#include <asm/pgtable_types.h>
#include <asm/percpu.h>
#include <asm/msr.h>
#include <asm/desc_defs.h>