Date: Fri, 27 May 2011 19:06:03 +0000 (UTC) From: Nathan Whitehorn <nwhitehorn@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r222376 - projects/pseries/powerpc/pseries Message-ID: <201105271906.p4RJ63FL048601@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nwhitehorn Date: Fri May 27 19:06:03 2011 New Revision: 222376 URL: http://svn.freebsd.org/changeset/base/222376 Log: Expand the #ifdefs in the non-SMP case. Modified: projects/pseries/powerpc/pseries/platform_chrp.c Modified: projects/pseries/powerpc/pseries/platform_chrp.c ============================================================================== --- projects/pseries/powerpc/pseries/platform_chrp.c Fri May 27 19:05:01 2011 (r222375) +++ projects/pseries/powerpc/pseries/platform_chrp.c Fri May 27 19:06:03 2011 (r222376) @@ -68,8 +68,8 @@ static u_long chrp_timebase_freq(platfor static int chrp_smp_first_cpu(platform_t, struct cpuref *cpuref); static int chrp_smp_next_cpu(platform_t, struct cpuref *cpuref); static int chrp_smp_get_bsp(platform_t, struct cpuref *cpuref); -static int chrp_smp_start_cpu(platform_t, struct pcpu *cpu); #ifdef SMP +static int chrp_smp_start_cpu(platform_t, struct pcpu *cpu); static struct cpu_group *chrp_smp_topo(platform_t plat); #endif static void chrp_reset(platform_t); @@ -84,8 +84,8 @@ static platform_method_t chrp_methods[] PLATFORMMETHOD(platform_smp_first_cpu, chrp_smp_first_cpu), PLATFORMMETHOD(platform_smp_next_cpu, chrp_smp_next_cpu), PLATFORMMETHOD(platform_smp_get_bsp, chrp_smp_get_bsp), - PLATFORMMETHOD(platform_smp_start_cpu, chrp_smp_start_cpu), #ifdef SMP + PLATFORMMETHOD(platform_smp_start_cpu, chrp_smp_start_cpu), PLATFORMMETHOD(platform_smp_topo, chrp_smp_topo), #endif @@ -281,6 +281,7 @@ chrp_smp_get_bsp(platform_t plat, struct return (0); } +#ifdef SMP static int chrp_smp_start_cpu(platform_t plat, struct pcpu *pc) { @@ -300,9 +301,7 @@ chrp_smp_start_cpu(platform_t plat, stru return (ENXIO); } -#ifdef SMP ap_pcpu = pc; -#endif powerpc_sync(); result = rtas_call_method(start_cpu, 3, 1, pc->pc_cpuid, EXC_RST, pc, @@ -320,7 +319,6 @@ chrp_smp_start_cpu(platform_t plat, stru return ((pc->pc_awake) ? 0 : EBUSY); } -#ifdef SMP static struct cpu_group * chrp_smp_topo(platform_t plat) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201105271906.p4RJ63FL048601>