git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
parisc
/
kernel
/
head.S
diff --git
a/arch/parisc/kernel/head.S
b/arch/parisc/kernel/head.S
index a84e31e828768943a7ac288ccb26aa49499b275c..0e3d9f9b9e33e97680190e3752cea063fce9c251 100644
(file)
--- a/
arch/parisc/kernel/head.S
+++ b/
arch/parisc/kernel/head.S
@@
-121,7
+121,7
@@
$pgt_fill_loop:
copy %r0,%r2
/* And the RFI Target address too */
- load32 start_
kernel
,%r11
+ load32 start_
parisc
,%r11
/* And the initial task pointer */
load32 init_thread_union,%r6