git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
sh
/
kernel
/
relocate_kernel.S
diff --git
a/arch/sh/kernel/relocate_kernel.S
b/arch/sh/kernel/relocate_kernel.S
index
b0695cf
..
c66cb32
100644
(file)
--- a/
arch/sh/kernel/relocate_kernel.S
+++ b/
arch/sh/kernel/relocate_kernel.S
@@
-7,12
+7,9
@@
* This source code is licensed under the GNU General Public License,
* Version 2. See the file COPYING for more details.
*/
* This source code is licensed under the GNU General Public License,
* Version 2. See the file COPYING for more details.
*/
-
-#include <linux/config.h>
#include <linux/linkage.h>
#include <linux/linkage.h>
-
-#define PAGE_SIZE 4096 /* must be same value as in <asm/page.h> */
-
+#include <asm/addrspace.h>
+#include <asm/page.h>
.globl relocate_new_kernel
relocate_new_kernel:
.globl relocate_new_kernel
relocate_new_kernel:
@@
-21,8
+18,8
@@
relocate_new_kernel:
/* r6 = start_address */
/* r7 = vbr_reg */
/* r6 = start_address */
/* r7 = vbr_reg */
- mov.l 10f,r8 /*
4096
*/
- mov.l 11f,r9 /*
0xa0000000
*/
+ mov.l 10f,r8 /*
PAGE_SIZE
*/
+ mov.l 11f,r9 /*
P2SEG
*/
/* stack setting */
add r8,r5
/* stack setting */
add r8,r5
@@
-33,7
+30,7
@@
relocate_new_kernel:
0:
mov.l @r4+,r0 /* cmd = *ind++ */
0:
mov.l @r4+,r0 /* cmd = *ind++ */
-1: /* addr = (cmd |
0xa0000000
) & 0xfffffff0 */
+1: /* addr = (cmd |
P2SEG
) & 0xfffffff0 */
mov r0,r2
or r9,r2
mov #-16,r1
mov r0,r2
or r9,r2
mov #-16,r1
@@
-93,7
+90,7
@@
relocate_new_kernel:
10:
.long PAGE_SIZE
11:
10:
.long PAGE_SIZE
11:
- .long
0xa0000000
+ .long
P2SEG
relocate_new_kernel_end:
relocate_new_kernel_end: