diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:51:28 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 13:51:28 -0700 |
| commit | 22ca532a4d137545244fdff0b687325fd4e13eae (patch) | |
| tree | 459f5116344c71d13d860f4fd9f0c2c477df268a /arch/ia64/include/asm/native/inst.h | |
| parent | 9224652cc76417bfe779bcdb1243cf0b083e3eee (diff) | |
| parent | f8d1f99f3958c46cdc983743d75d0b31b9accb80 (diff) | |
Pull pv_ops-xen into release branch
Diffstat (limited to 'arch/ia64/include/asm/native/inst.h')
| -rw-r--r-- | arch/ia64/include/asm/native/inst.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/ia64/include/asm/native/inst.h b/arch/ia64/include/asm/native/inst.h index c8efbf7b849..0a1026cca4f 100644 --- a/arch/ia64/include/asm/native/inst.h +++ b/arch/ia64/include/asm/native/inst.h @@ -36,8 +36,13 @@ ;; \ movl clob = PARAVIRT_POISON; \ ;; +# define CLOBBER_PRED(pred_clob) \ + ;; \ + cmp.eq pred_clob, p0 = r0, r0 \ + ;; #else -# define CLOBBER(clob) /* nothing */ +# define CLOBBER(clob) /* nothing */ +# define CLOBBER_PRED(pred_clob) /* nothing */ #endif #define MOV_FROM_IFA(reg) \ @@ -136,7 +141,8 @@ #define SSM_PSR_I(pred, pred_clob, clob) \ (pred) ssm psr.i \ - CLOBBER(clob) + CLOBBER(clob) \ + CLOBBER_PRED(pred_clob) #define RSM_PSR_I(pred, clob0, clob1) \ (pred) rsm psr.i \ |