diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-21 14:55:09 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-21 14:55:09 -0500 |
| commit | 57550b27ff5a13b00370fbfa34f2471c3456a41d (patch) | |
| tree | 09fbe86a7454b109821ae21a8f285d1f764eeaa8 /arch/ia64/xen/hypercall.S | |
| parent | bfe085f62f98a49e1b864e4950389c7205174e4f (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into x86/urgent
Diffstat (limited to 'arch/ia64/xen/hypercall.S')
| -rw-r--r-- | arch/ia64/xen/hypercall.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/xen/hypercall.S b/arch/ia64/xen/hypercall.S index d4ff0b9e79f1..45e02bb64a92 100644 --- a/arch/ia64/xen/hypercall.S +++ b/arch/ia64/xen/hypercall.S | |||
| @@ -58,7 +58,7 @@ __HCALL2(xen_set_rr, HYPERPRIVOP_SET_RR) | |||
| 58 | __HCALL2(xen_set_kr, HYPERPRIVOP_SET_KR) | 58 | __HCALL2(xen_set_kr, HYPERPRIVOP_SET_KR) |
| 59 | 59 | ||
| 60 | #ifdef CONFIG_IA32_SUPPORT | 60 | #ifdef CONFIG_IA32_SUPPORT |
| 61 | __HCALL1(xen_get_eflag, HYPERPRIVOP_GET_EFLAG) | 61 | __HCALL0(xen_get_eflag, HYPERPRIVOP_GET_EFLAG) |
| 62 | __HCALL1(xen_set_eflag, HYPERPRIVOP_SET_EFLAG) // refer SDM vol1 3.1.8 | 62 | __HCALL1(xen_set_eflag, HYPERPRIVOP_SET_EFLAG) // refer SDM vol1 3.1.8 |
| 63 | #endif /* CONFIG_IA32_SUPPORT */ | 63 | #endif /* CONFIG_IA32_SUPPORT */ |
| 64 | 64 | ||