projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus' of git://github.com/openrisc/linux
[linux-2.6-microblaze.git]
/
arch
/
openrisc
/
kernel
/
head.S
diff --git
a/arch/openrisc/kernel/head.S
b/arch/openrisc/kernel/head.S
index
af355e3
..
15f1b38
100644
(file)
--- a/
arch/openrisc/kernel/head.S
+++ b/
arch/openrisc/kernel/head.S
@@
-599,7
+599,7
@@
flush_tlb:
l.jal _flush_tlb
l.nop
l.jal _flush_tlb
l.nop
-/* The MMU needs to be enabled before or
32
_early_setup is called */
+/* The MMU needs to be enabled before or
1k
_early_setup is called */
enable_mmu:
/*
enable_mmu:
/*
@@
-641,9
+641,9
@@
enable_mmu:
/* magic number mismatch, set fdt pointer to null */
l.or r25,r0,r0
_fdt_found:
/* magic number mismatch, set fdt pointer to null */
l.or r25,r0,r0
_fdt_found:
- /* pass fdt pointer to or
32
_early_setup in r3 */
+ /* pass fdt pointer to or
1k
_early_setup in r3 */
l.or r3,r0,r25
l.or r3,r0,r25
- LOAD_SYMBOL_2_GPR(r24, or
32
_early_setup)
+ LOAD_SYMBOL_2_GPR(r24, or
1k
_early_setup)
l.jalr r24
l.nop
l.jalr r24
l.nop