Skip to contentSkip to conversation

x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr

PATCH In review Yinghai Lu 2 participants 5 messages Jan 23, 2008 x86

lore
Share & tools
lore

Yinghai Lu

author
#0 lore raw

PATCH 1/1 x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr

[PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr

Signed-off-by Yinghai Lu <[email protected]>
arch/x86/kernel/setup_64.c +0 -1
index 2643a8f..b587166 100644
@@ -349,7 +349,6 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_NUMA
 	x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init;
 #endif
-	x86_bios_cpu_apicid_early_ptr = (void *)&x86_bios_cpu_apicid_init;
 #endif
 
 #ifdef CONFIG_ACPI
author
#1 lore raw

PATCH 1/1 x86_64: should use array directly for early_ptr

[PATCH] x86_64: should use array directly for early_ptr

Signed-off-by Yinghai Lu <[email protected]>
arch/x86/kernel/setup_64.c +3 -3
@@ -344,10 +344,10 @@
 
 #ifdef CONFIG_SMP
 	/* setup to use the early static init tables during kernel startup */
-	x86_cpu_to_apicid_early_ptr = (void *)&x86_cpu_to_apicid_init;
-	x86_bios_cpu_apicid_early_ptr = (void *)&x86_bios_cpu_apicid_init;
+	x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init;
+	x86_bios_cpu_apicid_early_ptr = (void *)x86_bios_cpu_apicid_init;
 #ifdef CONFIG_NUMA
-	x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init;
+	x86_cpu_to_node_map_early_ptr = (void *)x86_cpu_to_node_map_init;
 #endif
 #endif
#2 lore raw

Re: [PATCH] x86_64: should use array directly for early_ptr

Quoted 10 lines · Yinghai Lu

[PATCH] x86_64: should use array directly for early_ptr

Signed-off-by Yinghai Lu <[email protected]>
arch/x86/kernel/setup_64.c +0 -0
@@ -344,10 +344,10 @@
 
 #ifdef CONFIG_SMP
 	/* setup to use the early static init tables during kernel startup */

arch/x86/kernel/setup_64.c line 353

Quoted 10 lines
arch/x86/kernel/setup_64.c +3 -3
-	x86_cpu_to_apicid_early_ptr = (void *)&x86_cpu_to_apicid_init;
-	x86_bios_cpu_apicid_early_ptr = (void *)&x86_bios_cpu_apicid_init;
+	x86_cpu_to_apicid_early_ptr = (void *)x86_cpu_to_apicid_init;
+	x86_bios_cpu_apicid_early_ptr = (void *)x86_bios_cpu_apicid_init;
 #ifdef CONFIG_NUMA
-	x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init;
+	x86_cpu_to_node_map_early_ptr = (void *)x86_cpu_to_node_map_init;
 #endif
 #endif

Also Thanks!

-Mike

#3 lore raw
In reply to Yinghai Lu
Quoted 9 lines · Yinghai Lu

[PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr

Signed-off-by Yinghai Lu <[email protected]>
arch/x86/kernel/setup_64.c +0 -0
index 2643a8f..b587166 100644

arch/x86/kernel/setup_64.c void __init setup_arch(char **cmdline_p) · line 354

Quoted 7 lines
arch/x86/kernel/setup_64.c +0 -1
@@ -349,7 +349,6 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_NUMA
 	x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init;
 #endif
-	x86_bios_cpu_apicid_early_ptr = (void *)&x86_bios_cpu_apicid_init;
 #endif
 
 #ifdef CONFIG_ACPI

Thanks Yinghai!

I wonder how this got past my testing (I do build and test !SMP and !NUMA versions.) I'll check into this.

Regards,
Mike

#4 lore raw
Quoted 16 lines · Mike Travis
Quoted 15 lines · Yinghai Lu

[PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr

Signed-off-by Yinghai Lu <[email protected]>
arch/x86/kernel/setup_64.c +0 -1
index 2643a8f..b587166 100644
@@ -349,7 +349,6 @@ void __init setup_arch(char **cmdline_p)
 #ifdef CONFIG_NUMA
 	x86_cpu_to_node_map_early_ptr = (void *)&x86_cpu_to_node_map_init;
 #endif
-	x86_bios_cpu_apicid_early_ptr = (void *)&x86_bios_cpu_apicid_init;
 #endif
Quoted 7 lines

arch/x86/kernel/setup_64.c void __init setup_arch(char **cmdline_p) · line 354

Quoted 1 line
arch/x86/kernel/setup_64.c +0 -0
 #ifdef CONFIG_ACPI

Thanks Yinghai!

I wonder how this got past my testing (I do build and test !SMP and !NUMA versions.) I'll check into this.

Hmm, never mind. Coffee has cleared up my confusion...

Quoted 3 lines

Regards,
Mike