public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr
@ 2008-01-23  8:56 Yinghai Lu
  2008-01-23  9:27 ` [PATCH] x86_64: should use array directly for early_ptr Yinghai Lu
  2008-01-23 14:16 ` [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr Mike Travis
  0 siblings, 2 replies; 5+ messages in thread
From: Yinghai Lu @ 2008-01-23  8:56 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: Mike Travis, Christoph Lameter, LKML

[PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index 2643a8f..b587166 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH] x86_64: should use array directly for early_ptr
  2008-01-23  8:56 [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr Yinghai Lu
@ 2008-01-23  9:27 ` Yinghai Lu
  2008-01-23 14:18   ` Mike Travis
  2008-01-23 14:16 ` [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr Mike Travis
  1 sibling, 1 reply; 5+ messages in thread
From: Yinghai Lu @ 2008-01-23  9:27 UTC (permalink / raw)
  To: Ingo Molnar; +Cc: Mike Travis, Christoph Lameter, LKML

[PATCH] x86_64: should use array directly for early_ptr

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>

--- a/arch/x86/kernel/setup_64.c	2008-01-23 01:21:06.000000000 -0800
+++ b/arch/x86/kernel/setup_64.c	2008-01-23 01:21:24.000000000 -0800
@@ -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
 

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr
  2008-01-23  8:56 [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr Yinghai Lu
  2008-01-23  9:27 ` [PATCH] x86_64: should use array directly for early_ptr Yinghai Lu
@ 2008-01-23 14:16 ` Mike Travis
  2008-01-23 14:37   ` Mike Travis
  1 sibling, 1 reply; 5+ messages in thread
From: Mike Travis @ 2008-01-23 14:16 UTC (permalink / raw)
  To: Yinghai Lu; +Cc: Ingo Molnar, Christoph Lameter, LKML

Yinghai Lu wrote:
> [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr
> 
> Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
> 
> diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
> index 2643a8f..b587166 100644
> --- a/arch/x86/kernel/setup_64.c
> +++ b/arch/x86/kernel/setup_64.c
> @@ -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

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] x86_64: should use array directly for early_ptr
  2008-01-23  9:27 ` [PATCH] x86_64: should use array directly for early_ptr Yinghai Lu
@ 2008-01-23 14:18   ` Mike Travis
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Travis @ 2008-01-23 14:18 UTC (permalink / raw)
  To: Yinghai Lu; +Cc: Ingo Molnar, Christoph Lameter, LKML

Yinghai Lu wrote:
> [PATCH] x86_64: should use array directly for early_ptr
> 
> Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
> 
> --- a/arch/x86/kernel/setup_64.c	2008-01-23 01:21:06.000000000 -0800
> +++ b/arch/x86/kernel/setup_64.c	2008-01-23 01:21:24.000000000 -0800
> @@ -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
>  


Also Thanks!

-Mike

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr
  2008-01-23 14:16 ` [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr Mike Travis
@ 2008-01-23 14:37   ` Mike Travis
  0 siblings, 0 replies; 5+ messages in thread
From: Mike Travis @ 2008-01-23 14:37 UTC (permalink / raw)
  To: Yinghai Lu; +Cc: Ingo Molnar, Christoph Lameter, LKML

Mike Travis wrote:
> Yinghai Lu wrote:
>> [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr
>>
>> Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
>>
>> diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
>> index 2643a8f..b587166 100644
>> --- a/arch/x86/kernel/setup_64.c
>> +++ b/arch/x86/kernel/setup_64.c
>> @@ -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.

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

> 
> Regards,
> Mike


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2008-01-23 14:37 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-01-23  8:56 [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr Yinghai Lu
2008-01-23  9:27 ` [PATCH] x86_64: should use array directly for early_ptr Yinghai Lu
2008-01-23 14:18   ` Mike Travis
2008-01-23 14:16 ` [PATCH] x86_64: remove duplicated line about x86_bios_cpu_apicid_early_ptr Mike Travis
2008-01-23 14:37   ` Mike Travis

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox