diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-12-03 04:11:06 -0500 |
| commit | 527491885554002837b5742202adc0ab5f536e54 (patch) | |
| tree | 6d9c44776e0b4368eccd414b92b957fac3c5a4c6 /arch/ia64/xen/hypercall.S | |
| parent | cea555d384b85271035814c5adad23e6c7fc5d2a (diff) | |
| parent | 2434bbb30e79468c49cff3cff6005236f55ed188 (diff) | |
Merge branch 'merge'
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 | ||