diff options
| author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 17:25:08 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-03-31 17:25:08 -0400 |
| commit | c66b31f3926165bc1d4128adc97a064dcbab421a (patch) | |
| tree | 13be75d33bd2b9d4ec45ec512ac38a2e7069062e /arch/ia64/kernel/ivt.S | |
| parent | 50fbe56c127efde659c686495eb1f925fd84ff0a (diff) | |
| parent | 7120569c76028a6883697b7643564f0c419cfe07 (diff) | |
Pull pvops into release branch
Diffstat (limited to 'arch/ia64/kernel/ivt.S')
| -rw-r--r-- | arch/ia64/kernel/ivt.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S index f675d8e33853..ec9a5fdfa1b9 100644 --- a/arch/ia64/kernel/ivt.S +++ b/arch/ia64/kernel/ivt.S | |||
| @@ -804,7 +804,7 @@ ENTRY(break_fault) | |||
| 804 | /////////////////////////////////////////////////////////////////////// | 804 | /////////////////////////////////////////////////////////////////////// |
| 805 | st1 [r16]=r0 // M2|3 clear current->thread.on_ustack flag | 805 | st1 [r16]=r0 // M2|3 clear current->thread.on_ustack flag |
| 806 | #ifdef CONFIG_VIRT_CPU_ACCOUNTING | 806 | #ifdef CONFIG_VIRT_CPU_ACCOUNTING |
| 807 | mov.m r30=ar.itc // M get cycle for accounting | 807 | MOV_FROM_ITC(p0, p14, r30, r18) // M get cycle for accounting |
| 808 | #else | 808 | #else |
| 809 | mov b6=r30 // I0 setup syscall handler branch reg early | 809 | mov b6=r30 // I0 setup syscall handler branch reg early |
| 810 | #endif | 810 | #endif |