projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
[powerpc.git]
/
arch
/
ia64
/
kernel
/
head.S
diff --git
a/arch/ia64/kernel/head.S
b/arch/ia64/kernel/head.S
index
bfe65b2
..
f1778a8
100644
(file)
--- a/
arch/ia64/kernel/head.S
+++ b/
arch/ia64/kernel/head.S
@@
-352,6
+352,7
@@
start_ap:
mov ar.rsc=0 // place RSE in enforced lazy mode
;;
loadrs // clear the dirty partition
mov ar.rsc=0 // place RSE in enforced lazy mode
;;
loadrs // clear the dirty partition
+ mov IA64_KR(PER_CPU_DATA)=r0 // clear physical per-CPU base
;;
mov ar.bspstore=r2 // establish the new RSE stack
;;
;;
mov ar.bspstore=r2 // establish the new RSE stack
;;
@@
-1060,7
+1061,7
@@
SET_REG(b5);
* the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.
*/
* the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.
*/
-#if
__GNUC__ < 3 ||
(__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+#if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
GLOBAL_ENTRY(ia64_spinlock_contention_pre3_4)
.prologue
GLOBAL_ENTRY(ia64_spinlock_contention_pre3_4)
.prologue