diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 07:09:00 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 07:09:00 -0500 |
| commit | b233969eaa98c7b339d955fe25a58bf6bf25739a (patch) | |
| tree | 96c372824bfe05cae4b2b2b57c96719d633296da /arch/x86/include/asm/paravirt.h | |
| parent | d040c1614c24162adc3fe106b182596999264e26 (diff) | |
| parent | 54321d947ae9d6a051b81e3eccaf2d8658aeecc6 (diff) | |
Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers
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
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
| -rw-r--r-- | arch/x86/include/asm/paravirt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index b788dfd20483..0617d5cc9712 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * para-virtualization: those hooks are defined here. */ | 4 | * para-virtualization: those hooks are defined here. */ |
| 5 | 5 | ||
| 6 | #ifdef CONFIG_PARAVIRT | 6 | #ifdef CONFIG_PARAVIRT |
| 7 | #include <asm/page.h> | 7 | #include <asm/pgtable_types.h> |
| 8 | #include <asm/asm.h> | 8 | #include <asm/asm.h> |
| 9 | 9 | ||
| 10 | /* Bitmask of what can be clobbered: usually at least eax. */ | 10 | /* Bitmask of what can be clobbered: usually at least eax. */ |