diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 16:32:35 -0500 |
| commit | 33edcf133ba93ecba2e4b6472e97b689895d805c (patch) | |
| tree | 327d7a20acef64005e7c5ccbfa1265be28aeb6ac /arch/x86/include/asm/xen/hypercall.h | |
| parent | be4d638c1597580ed2294d899d9f1a2cd10e462c (diff) | |
| parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/include/asm/xen/hypercall.h')
| -rw-r--r-- | arch/x86/include/asm/xen/hypercall.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/include/asm/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h index 3f6000d95fe2..5e79ca694326 100644 --- a/arch/x86/include/asm/xen/hypercall.h +++ b/arch/x86/include/asm/xen/hypercall.h | |||
| @@ -33,8 +33,14 @@ | |||
| 33 | #ifndef _ASM_X86_XEN_HYPERCALL_H | 33 | #ifndef _ASM_X86_XEN_HYPERCALL_H |
| 34 | #define _ASM_X86_XEN_HYPERCALL_H | 34 | #define _ASM_X86_XEN_HYPERCALL_H |
| 35 | 35 | ||
| 36 | #include <linux/kernel.h> | ||
| 37 | #include <linux/spinlock.h> | ||
| 36 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 37 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 40 | #include <linux/types.h> | ||
| 41 | |||
| 42 | #include <asm/page.h> | ||
| 43 | #include <asm/pgtable.h> | ||
| 38 | 44 | ||
| 39 | #include <xen/interface/xen.h> | 45 | #include <xen/interface/xen.h> |
| 40 | #include <xen/interface/sched.h> | 46 | #include <xen/interface/sched.h> |