diff options
author | Jonathan Corbet | 2008-07-14 23:29:34 +0200 |
---|---|---|
committer | Jonathan Corbet | 2008-07-14 23:29:34 +0200 |
commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
tree | d9cc09ab992825ef7fede4a688103503e3caf655 /arch/sparc64/kernel/rtrap.S | |
parent | IB/umad: BKL is not needed for ib_umad_open() (diff) | |
parent | Linux 2.6.26 (diff) | |
download | kernel-qcow2-linux-2fceef397f9880b212a74c418290ce69e7ac00eb.tar.gz kernel-qcow2-linux-2fceef397f9880b212a74c418290ce69e7ac00eb.tar.xz kernel-qcow2-linux-2fceef397f9880b212a74c418290ce69e7ac00eb.zip |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'arch/sparc64/kernel/rtrap.S')
-rw-r--r-- | arch/sparc64/kernel/rtrap.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index 16689b2930db..c6fc695fe1fe 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S @@ -1,4 +1,4 @@ -/* $Id: rtrap.S,v 1.61 2002/02/09 19:49:31 davem Exp $ +/* * rtrap.S: Preparing for return from trap on Sparc V9. * * Copyright (C) 1997,1998 Jakub Jelinek (jj@sunsite.mff.cuni.cz) @@ -363,6 +363,7 @@ kern_rtt: rdpr %canrestore, %g1 brz,pn %g1, kern_rtt_fill nop kern_rtt_restore: + stw %g0, [%sp + PTREGS_OFF + PT_V9_MAGIC] restore retry |