All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas() compilation error
       [not found] <A6AD88C3F2289247BE726C37303E1EB8B06CB5E9@orsmsx505.amr.corp.intel.com>
@ 2009-07-13 20:09   ` Fenghua Yu
  0 siblings, 0 replies; 4+ messages in thread
From: Fenghua Yu @ 2009-07-13 20:09 UTC (permalink / raw)
  To: Stephen Rothwell, Tejun Heo; +Cc: linux-next, linux-ia64

Fix ia64 build setup_per_cpu_areas() redifinition issue in UP configuration

When compiling ia64 kernel in UP configuration, the following compilation errors
are reported:

arch/ia64/kernel/setup.c:860: error: redefinition of 'setup_per_cpu_areas'
include/linux/percpu.h:185: error: previous definition of 'setup_per_cpu_areas' was here

The patch fixes the issue in arch/ia64/kernel/setup.c

Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>

---

The commit e74e396204bfcb67570ba4517b08f5918e69afea in linux-next causes this
build issue.  

 setup.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 1b23ec1..1de86c9 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -855,11 +855,17 @@ identify_cpu (struct cpuinfo_ia64 *c)
 	c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1));
 }
 
+/*
+ * In UP configuration, setup_per_cpu_areas() is defined in
+ * include/linux/percpu.h
+ */
+#ifdef CONFIG_SMP
 void __init
 setup_per_cpu_areas (void)
 {
 	/* start_kernel() requires this... */
 }
+#endif
 
 /*
  * Do the following calculations:

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

* [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas() compilation error
@ 2009-07-13 20:09   ` Fenghua Yu
  0 siblings, 0 replies; 4+ messages in thread
From: Fenghua Yu @ 2009-07-13 20:09 UTC (permalink / raw)
  To: Stephen Rothwell, Tejun Heo; +Cc: linux-next, linux-ia64

Fix ia64 build setup_per_cpu_areas() redifinition issue in UP configuration

When compiling ia64 kernel in UP configuration, the following compilation errors
are reported:

arch/ia64/kernel/setup.c:860: error: redefinition of 'setup_per_cpu_areas'
include/linux/percpu.h:185: error: previous definition of 'setup_per_cpu_areas' was here

The patch fixes the issue in arch/ia64/kernel/setup.c

Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>

---

The commit e74e396204bfcb67570ba4517b08f5918e69afea in linux-next causes this
build issue.  

 setup.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 1b23ec1..1de86c9 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -855,11 +855,17 @@ identify_cpu (struct cpuinfo_ia64 *c)
 	c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1));
 }
 
+/*
+ * In UP configuration, setup_per_cpu_areas() is defined in
+ * include/linux/percpu.h
+ */
+#ifdef CONFIG_SMP
 void __init
 setup_per_cpu_areas (void)
 {
 	/* start_kernel() requires this... */
 }
+#endif
 
 /*
  * Do the following calculations:

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

* Re: [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas()
  2009-07-13 20:09   ` Fenghua Yu
@ 2009-07-15  2:48     ` Tejun Heo
  -1 siblings, 0 replies; 4+ messages in thread
From: Tejun Heo @ 2009-07-15  2:48 UTC (permalink / raw)
  To: Fenghua Yu; +Cc: Stephen Rothwell, linux-next, linux-ia64

Fenghua Yu wrote:
> Fix ia64 build setup_per_cpu_areas() redifinition issue in UP configuration
> 
> When compiling ia64 kernel in UP configuration, the following compilation errors
> are reported:
> 
> arch/ia64/kernel/setup.c:860: error: redefinition of 'setup_per_cpu_areas'
> include/linux/percpu.h:185: error: previous definition of 'setup_per_cpu_areas' was here
> 
> The patch fixes the issue in arch/ia64/kernel/setup.c
> 
> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>

Committed to percpu#for-next.  Thanks.

-- 
tejun

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

* Re: [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas() compilation error
@ 2009-07-15  2:48     ` Tejun Heo
  0 siblings, 0 replies; 4+ messages in thread
From: Tejun Heo @ 2009-07-15  2:48 UTC (permalink / raw)
  To: Fenghua Yu; +Cc: Stephen Rothwell, linux-next, linux-ia64

Fenghua Yu wrote:
> Fix ia64 build setup_per_cpu_areas() redifinition issue in UP configuration
> 
> When compiling ia64 kernel in UP configuration, the following compilation errors
> are reported:
> 
> arch/ia64/kernel/setup.c:860: error: redefinition of 'setup_per_cpu_areas'
> include/linux/percpu.h:185: error: previous definition of 'setup_per_cpu_areas' was here
> 
> The patch fixes the issue in arch/ia64/kernel/setup.c
> 
> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>

Committed to percpu#for-next.  Thanks.

-- 
tejun

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

end of thread, other threads:[~2009-07-15  2:48 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <A6AD88C3F2289247BE726C37303E1EB8B06CB5E9@orsmsx505.amr.corp.intel.com>
2009-07-13 20:09 ` [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas() compilation error Fenghua Yu
2009-07-13 20:09   ` Fenghua Yu
2009-07-15  2:48   ` [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas() Tejun Heo
2009-07-15  2:48     ` [PATCH] linux-next arch/ia64/kernel/setup.c: Fix setup_per_cpu_areas() compilation error Tejun Heo

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.