diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/ia64/xen/hypercall.S | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/ia64/xen/hypercall.S')
| -rw-r--r-- | arch/ia64/xen/hypercall.S | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ia64/xen/hypercall.S b/arch/ia64/xen/hypercall.S index e32dae444dd6..08847aa12583 100644 --- a/arch/ia64/xen/hypercall.S +++ b/arch/ia64/xen/hypercall.S | |||
| @@ -58,11 +58,6 @@ __HCALL2(xen_ptcga, HYPERPRIVOP_PTC_GA) | |||
| 58 | __HCALL2(xen_set_rr, HYPERPRIVOP_SET_RR) | 58 | __HCALL2(xen_set_rr, HYPERPRIVOP_SET_RR) |
| 59 | __HCALL2(xen_set_kr, HYPERPRIVOP_SET_KR) | 59 | __HCALL2(xen_set_kr, HYPERPRIVOP_SET_KR) |
| 60 | 60 | ||
| 61 | #ifdef CONFIG_IA32_SUPPORT | ||
| 62 | __HCALL0(xen_get_eflag, HYPERPRIVOP_GET_EFLAG) | ||
| 63 | __HCALL1(xen_set_eflag, HYPERPRIVOP_SET_EFLAG) // refer SDM vol1 3.1.8 | ||
| 64 | #endif /* CONFIG_IA32_SUPPORT */ | ||
| 65 | |||
| 66 | GLOBAL_ENTRY(xen_set_rr0_to_rr4) | 61 | GLOBAL_ENTRY(xen_set_rr0_to_rr4) |
| 67 | mov r8=r32 | 62 | mov r8=r32 |
| 68 | mov r9=r33 | 63 | mov r9=r33 |