lkml.org 
[lkml]   [2006]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] make mach-generic/summit.c compile on UP
From
Date
On Fri, 2006-10-06 at 11:11 +0200, Jiri Kosina wrote:
> On Thu, 5 Oct 2006, keith mannthey wrote:
>
> > Yea I am pretty sure CONFIG_X86_GENERIC is ment to boot UP and SMP
> > kernels.
> > Maybe just moving apicid_2_node to a UP safe location would be a good
> > way to go as well. I overlooked the fact that CONFIG_X86_GENERIC wasn't
> > always SMP.
>
> Below is the patch doing exactly this. Fixes compilation of Linus' git
> tree, applicable also to -mm. Please apply.
>
> [PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable
>
> CONFIG_X86_GENERIC is not exclusively CONFIG_SMP, as mach-default/ could
> be compiled also for UP archs. The patch fixes compilation error in
> include/asm/mach-summit/mach_apic.h in case CONFIG_X86_GENERIC && !CONFIG_SMP
>
> Signed-off-by: Jiri Kosina <jikos@jikos.cz>
>
> include/asm-i386/smp.h | 5 +++--
> 1 files changed, 3 insertions(+), 2 deletions(-)
>
> --- a/include/asm-i386/smp.h
> +++ b/include/asm-i386/smp.h
> @@ -46,8 +46,6 @@ extern u8 x86_cpu_to_apicid[];
>
> #define cpu_physical_id(cpu) x86_cpu_to_apicid[cpu]
>
> -extern u8 apicid_2_node[];
> -
> #ifdef CONFIG_HOTPLUG_CPU
> extern void cpu_exit_clear(void);
> extern void cpu_uninit(void);
> @@ -101,6 +99,9 @@ #define NO_PROC_ID 0xFF /* No processo
> #endif
>
> #ifndef __ASSEMBLY__
> +
> +extern u8 apicid_2_node[];
> +
> #ifdef CONFIG_X86_LOCAL_APIC
> static __inline int logical_smp_processor_id(void)
> {

Look good to me. Thanks for fixing this.

Acked-by: Keith Mannthey <kmannth@us.ibm.com>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-10-06 19:27    [W:0.063 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site