git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
entry.S
diff --git
a/arch/parisc/kernel/entry.S
b/arch/parisc/kernel/entry.S
index
d9e53cf
..
95c1b8e
100644
(file)
--- a/
arch/parisc/kernel/entry.S
+++ b/
arch/parisc/kernel/entry.S
@@
-22,7
+22,6
@@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#include <linux/config.h>
#include <asm/asm-offsets.h>
/* we have the following possibilities to act on an interruption:
#include <asm/asm-offsets.h>
/* we have the following possibilities to act on an interruption:
@@
-1638,7
+1637,7
@@
dbit_trap_20w:
load32 PA(pa_dbit_lock),t0
dbit_spin_20w:
load32 PA(pa_dbit_lock),t0
dbit_spin_20w:
-
ldcw
0(t0),t1
+
LDCW
0(t0),t1
cmpib,= 0,t1,dbit_spin_20w
nop
cmpib,= 0,t1,dbit_spin_20w
nop
@@
-1674,7
+1673,7
@@
dbit_trap_11:
load32 PA(pa_dbit_lock),t0
dbit_spin_11:
load32 PA(pa_dbit_lock),t0
dbit_spin_11:
-
ldcw
0(t0),t1
+
LDCW
0(t0),t1
cmpib,= 0,t1,dbit_spin_11
nop
cmpib,= 0,t1,dbit_spin_11
nop
@@
-1714,7
+1713,7
@@
dbit_trap_20:
load32 PA(pa_dbit_lock),t0
dbit_spin_20:
load32 PA(pa_dbit_lock),t0
dbit_spin_20:
-
ldcw
0(t0),t1
+
LDCW
0(t0),t1
cmpib,= 0,t1,dbit_spin_20
nop
cmpib,= 0,t1,dbit_spin_20
nop