diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 10:24:52 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 10:24:52 -0800 |
| commit | 21511abd0a248a3f225d3b611cfabb93124605a7 (patch) | |
| tree | eb490f94322f3c76169ea7e5ec09524f275f390e /include/asm-ia64/processor.h | |
| parent | 39ce941ec15032c0efc3632b9f00a6b2365e1870 (diff) | |
| parent | e1b0d4ba46b42909d11ea152a6b56ee76f062ca3 (diff) | |
| download | op-kernel-dev-21511abd0a248a3f225d3b611cfabb93124605a7.zip op-kernel-dev-21511abd0a248a3f225d3b611cfabb93124605a7.tar.gz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] make pfm_get_task work with virtual pids
[IA64] honor notify_die() returning NOTIFY_STOP
[IA64] remove dead code: __cpu_{down,die} from !HOTPLUG_CPU
[IA64] Appoint kvm/ia64 Maintainers
[IA64] ia64_set_psr should use srlz.i
[IA64] Export three symbols for module use
[IA64] mca style cleanup
[IA64] sn_hwperf semaphore to mutex
[IA64] generalize attribute of fsyscall_gtod_data
[IA64] efi.c Add /* never reached */ annotation
[IA64] efi.c Spelling/punctuation fixes
[IA64] Make efi.c mostly fit in 80 columns
[IA64] aliasing-test: fix gcc warnings on non-ia64
[IA64] Slim-down __clear_bit_unlock
[IA64] Fix the order of atomic operations in restore_previous_kprobes on ia64
[IA64] constify function pointer tables
[IA64] fix userspace compile error in gcc_intrin.h
Diffstat (limited to 'include/asm-ia64/processor.h')
| -rw-r--r-- | include/asm-ia64/processor.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/processor.h b/include/asm-ia64/processor.h index 666385b..741f7ec 100644 --- a/include/asm-ia64/processor.h +++ b/include/asm-ia64/processor.h @@ -473,7 +473,7 @@ ia64_set_psr (__u64 psr) { ia64_stop(); ia64_setreg(_IA64_REG_PSR_L, psr); - ia64_srlz_d(); + ia64_srlz_i(); } /* |
