forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 9999e48639b3cecb08ffb37358bcba3b48161b29
kernel/arch/x86/realmode/rm/reboot.S
....@@ -19,7 +19,7 @@
1919 */
2020 .section ".text32", "ax"
2121 .code32
22
-ENTRY(machine_real_restart_asm)
22
+SYM_CODE_START(machine_real_restart_asm)
2323
2424 #ifdef CONFIG_X86_64
2525 /* Switch to trampoline GDT as it is guaranteed < 4 GiB */
....@@ -33,7 +33,7 @@
3333 movl %eax, %cr0
3434 ljmpl $__KERNEL32_CS, $pa_machine_real_restart_paging_off
3535
36
-GLOBAL(machine_real_restart_paging_off)
36
+SYM_INNER_LABEL(machine_real_restart_paging_off, SYM_L_GLOBAL)
3737 xorl %eax, %eax
3838 xorl %edx, %edx
3939 movl $MSR_EFER, %ecx
....@@ -63,6 +63,7 @@
6363 movl %ecx, %gs
6464 movl %ecx, %ss
6565 ljmpw $8, $1f
66
+SYM_CODE_END(machine_real_restart_asm)
6667
6768 /*
6869 * This is 16-bit protected mode code to disable paging and the cache,
....@@ -127,13 +128,13 @@
127128 .section ".rodata", "a"
128129
129130 .balign 16
130
-GLOBAL(machine_real_restart_idt)
131
+SYM_DATA_START(machine_real_restart_idt)
131132 .word 0xffff /* Length - real mode default value */
132133 .long 0 /* Base - real mode default value */
133
-END(machine_real_restart_idt)
134
+SYM_DATA_END(machine_real_restart_idt)
134135
135136 .balign 16
136
-GLOBAL(machine_real_restart_gdt)
137
+SYM_DATA_START(machine_real_restart_gdt)
137138 /* Self-pointer */
138139 .word 0xffff /* Length - real mode default value */
139140 .long pa_machine_real_restart_gdt
....@@ -153,4 +154,4 @@
153154 * semantics we don't have to reload the segments once CR0.PE = 0.
154155 */
155156 .quad GDT_ENTRY(0x0093, 0x100, 0xffff)
156
-END(machine_real_restart_gdt)
157
+SYM_DATA_END(machine_real_restart_gdt)