projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
[cascardo/linux.git]
/
arch
/
mips
/
kernel
/
bmips_vec.S
diff --git
a/arch/mips/kernel/bmips_vec.S
b/arch/mips/kernel/bmips_vec.S
index
290c23b
..
8649507
100644
(file)
--- a/
arch/mips/kernel/bmips_vec.S
+++ b/
arch/mips/kernel/bmips_vec.S
@@
-208,7
+208,6
@@
bmips_reset_nmi_vec_end:
END(bmips_reset_nmi_vec)
.set pop
- .previous
/***********************************************************************
* CPU1 warm restart vector (used for second and subsequent boots).
@@
-281,5
+280,3
@@
LEAF(bmips_enable_xks01)
jr ra
END(bmips_enable_xks01)
-
- .previous