Removing SYMBOL_NAME part 1
PATCH 1/1 Removing SYMBOL_NAME part 1
The SYMBOL_NAME macro (and variations) have been obsolete since 2.1.0, when the option to compile the kernel in a.out format was removed. This patch starts the process of removing these macros, starting with x86.
Signature · 1 line
Brian Gerst
arch/i386/boot/compressed/head.S +4 -4
@@ -37,7 +37,7 @@ movl %eax,%fs movl %eax,%gs - lss SYMBOL_NAME(stack_start),%esp + lss stack_start,%esp xorl %eax,%eax 1: incl %eax # check that A20 really IS enabled movl %eax,0x000000 # loop forever if it isn't
@@ -55,8 +55,8 @@ * Clear BSS */ xorl %eax,%eax - movl $ SYMBOL_NAME(_edata),%edi - movl $ SYMBOL_NAME(_end),%ecx + movl $_edata,%edi + movl $_end,%ecx subl %edi,%ecx cld rep
@@ -68,7 +68,7 @@ movl %esp,%eax pushl %esi # real mode pointer as second arg pushl %eax # address of structure as first arg - call SYMBOL_NAME(decompress_kernel) + call decompress_kernel orl %eax,%eax jnz 3f popl %esi # discard address
arch/i386/kernel/acpi_wakeup.S +1 -1
@@ -36,7 +36,7 @@ orl $0x80000001, %eax movl %eax, %cr0 - ljmpl $__KERNEL_CS,$SYMBOL_NAME(wakeup_pmode_return) + ljmpl $__KERNEL_CS,$wakeup_pmode_return .code32 ALIGN
arch/i386/kernel/apm.c +2 -2
@@ -578,7 +578,7 @@ __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - "lcall *%%cs:" SYMBOL_NAME_STR(apm_bios_entry) "\n\t" +"lcall *%%cs:apm_bios_entry\n\t" "setc %%al\n\t" "popl %%ebp\n\t" "popl %%edi\n\t"
@@ -625,7 +625,7 @@ __asm__ __volatile__(APM_DO_ZERO_SEGS "pushl %%edi\n\t" "pushl %%ebp\n\t" - "lcall *%%cs:" SYMBOL_NAME_STR(apm_bios_entry) "\n\t" +"lcall *%%cs:apm_bios_entry\n\t" "setc %%bl\n\t" "popl %%ebp\n\t" "popl %%edi\n\t"
arch/i386/kernel/entry.S +278 -279
713 lines not on this page · raw message
arch/i386/kernel/head.S +17 -17
@@ -26,7 +26,7 @@ * References to members of the boot_cpu_data structure. */ -#define CPU_PARAMS SYMBOL_NAME(boot_cpu_data) +#define CPU_PARAMS boot_cpu_data #define X86 CPU_PARAMS+0 #define X86_VENDOR CPU_PARAMS+1 #define X86_MODEL CPU_PARAMS+2
@@ -120,8 +120,8 @@ * No need to cld as DF is already clear from cld above... */ xorl %eax,%eax - movl $ SYMBOL_NAME(__bss_start),%edi - movl $ SYMBOL_NAME(_end),%ecx + movl $__bss_start,%edi + movl $_end,%ecx subl %edi,%ecx rep stosb
@@ -145,7 +145,7 @@ * * Note: %esi still has the pointer to the real-mode data. */ - movl $ SYMBOL_NAME(empty_zero_page),%edi + movl $empty_zero_page,%edi movl $512,%ecx cld rep
@@ -154,7 +154,7 @@ movl $512,%ecx rep stosl - movl SYMBOL_NAME(empty_zero_page)+NEW_CL_POINTER,%esi + movl empty_zero_page+NEW_CL_POINTER,%esi andl %esi,%esi jnz 2f # New command line protocol cmpw $(OLD_CL_MAGIC),OLD_CL_MAGIC_ADDR
@@ -162,7 +162,7 @@ movzwl OLD_CL_OFFSET,%esi addl $(OLD_CL_BASE_ADDR),%esi 2: - movl $ SYMBOL_NAME(empty_zero_page)+2048,%edi + movl $empty_zero_page+2048,%edi movl $512,%ecx rep movsl
@@ -263,11 +263,11 @@ cmpb $1,%cl je 1f # the first CPU calls start_kernel # all other CPUs call initialize_secondary - call SYMBOL_NAME(initialize_secondary) + call initialize_secondary jmp L6 1: #endif - call SYMBOL_NAME(start_kernel) + call start_kernel L6: jmp L6 # main should never return here, but # just in case, we know what happens.
@@ -309,7 +309,7 @@ movw %dx,%ax /* selector = 0x0010 = cs */ movw $0x8E00,%dx /* interrupt gate - dpl=0, present */ - lea SYMBOL_NAME(idt_table),%edi + lea idt_table,%edi mov $256,%ecx rp_sidt: movl %eax,(%edi)
@@ -320,7 +320,7 @@ ret ENTRY(stack_start) - .long SYMBOL_NAME(init_thread_union)+8192 + .long init_thread_union+8192 .long __KERNEL_DS /* This is the default interrupt "handler" :-) */
@@ -338,7 +338,7 @@ movl %eax,%ds movl %eax,%es pushl $int_msg - call SYMBOL_NAME(printk) + call printk popl %eax popl %ds popl %es
@@ -356,21 +356,21 @@ #define GDT_ENTRIES (__TSS(NR_CPUS)) -.globl SYMBOL_NAME(idt) -.globl SYMBOL_NAME(gdt) +.globl idt +.globl gdt ALIGN .word 0 idt_descr: .word IDT_ENTRIES*8-1 # idt contains 256 entries -SYMBOL_NAME(idt): - .long SYMBOL_NAME(idt_table) +idt: + .long idt_table .word 0 gdt_descr: .word GDT_ENTRIES*8-1 -SYMBOL_NAME(gdt): - .long SYMBOL_NAME(gdt_table) +gdt: + .long gdt_table /* * This is initialized to create an identity-mapping at 0-8M (for bootup
arch/i386/kernel/trampoline.S +2 -2
@@ -67,5 +67,5 @@ .word 0x0800 # gdt limit = 2048, 256 GDT entries .long gdt_table-__PAGE_OFFSET # gdt base = gdt (first SMP CPU) -.globl SYMBOL_NAME(trampoline_end) -SYMBOL_NAME_LABEL(trampoline_end) +.globl trampoline_end +trampoline_end:
arch/i386/math-emu/fpu_asm.h +1 -1
@@ -12,7 +12,7 @@#include <linux/linkage.h> -#define EXCEPTION SYMBOL_NAME(FPU_exception) +#define EXCEPTION FPU_exception#define PARAM1 8(%ebp)
arch/i386/math-emu/reg_norm.S +2 -2
@@ -83,7 +83,7 @@ /* Convert the exponent to 80x87 form. */ addw EXTENDED_Ebias,EXP(%ebx) push %ebx - call SYMBOL_NAME(arith_underflow) + call arith_underflow pop %ebx jmp L_exit
@@ -91,7 +91,7 @@ /* Convert the exponent to 80x87 form. */ addw EXTENDED_Ebias,EXP(%ebx) push %ebx - call SYMBOL_NAME(arith_overflow) + call arith_overflow pop %ebx jmp L_exit
arch/i386/math-emu/reg_round.S +4 -4
@@ -447,7 +447,7 @@ L_precision_lost_up: push %edx push %eax - call SYMBOL_NAME(set_precision_flag_up) + call set_precision_flag_up popl %eax popl %edx jmp L_no_precision_loss
@@ -459,7 +459,7 @@ L_precision_lost_down: push %edx push %eax - call SYMBOL_NAME(set_precision_flag_down) + call set_precision_flag_down popl %eax popl %edx jmp L_no_precision_loss
@@ -617,7 +617,7 @@ */ L_underflow_to_zero: push %eax - call SYMBOL_NAME(set_precision_flag_down) + call set_precision_flag_down popl %eax push %eax
@@ -636,7 +636,7 @@ L_overflow: addw EXTENDED_Ebias,EXP(%edi) /* Set for unmasked response. */ push %edi - call SYMBOL_NAME(arith_overflow) + call arith_overflow pop %edi jmp fpu_reg_round_signed_special_exit