Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 305452
b: refs/heads/master
c: 8f6380b
h: refs/heads/master
v: v3
  • Loading branch information
H. Peter Anvin committed Apr 20, 2012
1 parent ce34507 commit a32ec78
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f542c5d6e57ea32daae3708a71911d9f5c883c5a
refs/heads/master: 8f6380b9ec1cc4bed9b38144f739b87dd2cddb1d
6 changes: 2 additions & 4 deletions trunk/arch/x86/xen/xen-asm_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <asm/thread_info.h>
#include <asm/processor-flags.h>
#include <asm/segment.h>
#include <asm/asm.h>

#include <xen/interface/xen.h>

Expand Down Expand Up @@ -137,10 +138,7 @@ iret_restore_end:

1: iret
xen_iret_end_crit:
.section __ex_table, "a"
.align 4
.long 1b, iret_exc
.previous
_ASM_EXTABLE(1b, iret_exc)

hyper_iret:
/* put this out of line since its very rarely used */
Expand Down

0 comments on commit a32ec78

Please sign in to comment.