LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um
@ 2007-03-01 7:18 Fernando Luis Vázquez Cao
2007-03-01 9:03 ` Heiko Carstens
0 siblings, 1 reply; 5+ messages in thread
From: Fernando Luis Vázquez Cao @ 2007-03-01 7:18 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: fastboot, ebiederm, ak, akpm, judith
Move definition of hard_smp_processor_id to asm/smp.h on alpha, m32r,
powerpc, s390, sparc, sparc64, and um architectures.
Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
---
diff -urNp linux-2.6.21-rc2/include/asm-alpha/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h
--- linux-2.6.21-rc2/include/asm-alpha/smp.h 2007-02-05 03:44:54.000000000 +0900
+++ linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h 2007-03-07 13:34:14.000000000 +0900
@@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func
#else /* CONFIG_SMP */
+#define hard_smp_processor_id() 0
#define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
#endif /* CONFIG_SMP */
diff -urNp linux-2.6.21-rc2/include/asm-m32r/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-m32r/smp.h
--- linux-2.6.21-rc2/include/asm-m32r/smp.h 2007-03-07 12:04:26.000000000 +0900
+++ linux-2.6.21-rc2-hwcpuid/include/asm-m32r/smp.h 2007-03-07 13:39:22.000000000 +0900
@@ -108,6 +108,10 @@ extern unsigned long send_IPI_mask_phys(
#define IPI_SHIFT (0)
#define NR_IPIS (8)
-#endif /* CONFIG_SMP */
+#else /* CONFIG_SMP */
+
+#define hard_smp_processor_id() 0
+
+#endif /* CONFIG_SMP */
#endif /* _ASM_M32R_SMP_H */
diff -urNp linux-2.6.21-rc2/include/asm-powerpc/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-powerpc/smp.h
--- linux-2.6.21-rc2/include/asm-powerpc/smp.h 2007-03-07 12:04:26.000000000 +0900
+++ linux-2.6.21-rc2-hwcpuid/include/asm-powerpc/smp.h 2007-03-07 13:54:18.000000000 +0900
@@ -83,6 +83,7 @@ extern void __cpu_die(unsigned int cpu);
#else
/* for UP */
+#define hard_smp_processor_id() 0
#define smp_setup_cpu_maps()
#endif /* CONFIG_SMP */
diff -urNp linux-2.6.21-rc2/include/asm-s390/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-s390/smp.h
--- linux-2.6.21-rc2/include/asm-s390/smp.h 2007-03-07 12:04:26.000000000 +0900
+++ linux-2.6.21-rc2-hwcpuid/include/asm-s390/smp.h 2007-03-07 13:43:31.000000000 +0900
@@ -113,6 +113,7 @@ static inline void smp_send_stop(void)
__load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
}
+#define hard_smp_processor_id() 0
#define smp_cpu_not_running(cpu) 1
#define smp_get_cpu(cpu) ({ 0; })
#define smp_put_cpu(cpu) ({ 0; })
diff -urNp linux-2.6.21-rc2/include/asm-sparc/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-sparc/smp.h
--- linux-2.6.21-rc2/include/asm-sparc/smp.h 2007-02-05 03:44:54.000000000 +0900
+++ linux-2.6.21-rc2-hwcpuid/include/asm-sparc/smp.h 2007-03-07 13:36:27.000000000 +0900
@@ -165,6 +165,7 @@ void smp_setup_cpu_possible_map(void);
#else /* SMP */
+#define hard_smp_processor_id() 0
#define smp_setup_cpu_possible_map() do { } while (0)
#endif /* !(SMP) */
diff -urNp linux-2.6.21-rc2/include/asm-sparc64/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-sparc64/smp.h
--- linux-2.6.21-rc2/include/asm-sparc64/smp.h 2007-02-05 03:44:54.000000000 +0900
+++ linux-2.6.21-rc2-hwcpuid/include/asm-sparc64/smp.h 2007-03-07 13:48:35.000000000 +0900
@@ -47,6 +47,7 @@ extern void smp_setup_cpu_possible_map(v
#else
+#define hard_smp_processor_id() 0
#define smp_setup_cpu_possible_map() do { } while (0)
#endif /* !(CONFIG_SMP) */
diff -urNp linux-2.6.21-rc2/include/asm-um/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-um/smp.h
--- linux-2.6.21-rc2/include/asm-um/smp.h 2007-02-05 03:44:54.000000000 +0900
+++ linux-2.6.21-rc2-hwcpuid/include/asm-um/smp.h 2007-03-07 13:26:01.000000000 +0900
@@ -24,6 +24,10 @@ extern inline void smp_cpus_done(unsigne
extern struct task_struct *idle_threads[NR_CPUS];
+#else
+
+#define hard_smp_processor_id() 0
+
#endif
#endif
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um
2007-03-01 7:18 [PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um Fernando Luis Vázquez Cao
@ 2007-03-01 9:03 ` Heiko Carstens
2007-03-02 8:31 ` Fernando Luis Vázquez Cao
0 siblings, 1 reply; 5+ messages in thread
From: Heiko Carstens @ 2007-03-01 9:03 UTC (permalink / raw)
To: Fernando Luis Vázquez Cao
Cc: Linux Kernel Mailing List, fastboot, ebiederm, ak, akpm, judith
On Thu, Mar 01, 2007 at 04:18:23PM +0900, Fernando Luis Vázquez Cao wrote:
> Move definition of hard_smp_processor_id to asm/smp.h on alpha, m32r,
> powerpc, s390, sparc, sparc64, and um architectures.
>
> Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> ---
>
> diff -urNp linux-2.6.21-rc2/include/asm-alpha/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h
> --- linux-2.6.21-rc2/include/asm-alpha/smp.h 2007-02-05 03:44:54.000000000 +0900
> +++ linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h 2007-03-07 13:34:14.000000000 +0900
> @@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func
>
> #else /* CONFIG_SMP */
>
> +#define hard_smp_processor_id() 0
> #define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
>
> #endif /* CONFIG_SMP */
/me thinks you should merge this patch with patch 1. Otherwise there is no
hard_smp_processor_id() defined on any architecture if only patch 1 is
applied. That would break a git bisect search.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um
2007-03-01 9:03 ` Heiko Carstens
@ 2007-03-02 8:31 ` Fernando Luis Vázquez Cao
2007-03-02 8:39 ` Andrew Morton
0 siblings, 1 reply; 5+ messages in thread
From: Fernando Luis Vázquez Cao @ 2007-03-02 8:31 UTC (permalink / raw)
To: Heiko Carstens
Cc: Linux Kernel Mailing List, fastboot, ebiederm, ak, akpm, judith
On Thu, 2007-03-01 at 10:03 +0100, Heiko Carstens wrote:
> On Thu, Mar 01, 2007 at 04:18:23PM +0900, Fernando Luis Vázquez Cao wrote:
> > Move definition of hard_smp_processor_id to asm/smp.h on alpha, m32r,
> > powerpc, s390, sparc, sparc64, and um architectures.
> >
> > Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> > ---
> >
> > diff -urNp linux-2.6.21-rc2/include/asm-alpha/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h
> > --- linux-2.6.21-rc2/include/asm-alpha/smp.h 2007-02-05 03:44:54.000000000 +0900
> > +++ linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h 2007-03-07 13:34:14.000000000 +0900
> > @@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func
> >
> > #else /* CONFIG_SMP */
> >
> > +#define hard_smp_processor_id() 0
> > #define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
> >
> > #endif /* CONFIG_SMP */
>
> /me thinks you should merge this patch with patch 1. Otherwise there is no
> hard_smp_processor_id() defined on any architecture if only patch 1 is
> applied. That would break a git bisect search.
Hi Heiko,
Thank you for reviewing the patch-set. The patches have already been
merged in Andrew's tree but I will take your advice into account when
submitting new patches. I certainly would not like to break bisect
searches.
Fernando
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um
2007-03-02 8:31 ` Fernando Luis Vázquez Cao
@ 2007-03-02 8:39 ` Andrew Morton
2007-03-02 8:43 ` Fernando Luis Vázquez Cao
0 siblings, 1 reply; 5+ messages in thread
From: Andrew Morton @ 2007-03-02 8:39 UTC (permalink / raw)
To: Fernando Luis Vázquez Cao
Cc: Heiko Carstens, Linux Kernel Mailing List, fastboot, ebiederm,
ak, judith
On Fri, 02 Mar 2007 17:31:21 +0900 Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp> wrote:
> On Thu, 2007-03-01 at 10:03 +0100, Heiko Carstens wrote:
> > On Thu, Mar 01, 2007 at 04:18:23PM +0900, Fernando Luis Vázquez Cao wrote:
> > > Move definition of hard_smp_processor_id to asm/smp.h on alpha, m32r,
> > > powerpc, s390, sparc, sparc64, and um architectures.
> > >
> > > Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> > > ---
> > >
> > > diff -urNp linux-2.6.21-rc2/include/asm-alpha/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h
> > > --- linux-2.6.21-rc2/include/asm-alpha/smp.h 2007-02-05 03:44:54.000000000 +0900
> > > +++ linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h 2007-03-07 13:34:14.000000000 +0900
> > > @@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func
> > >
> > > #else /* CONFIG_SMP */
> > >
> > > +#define hard_smp_processor_id() 0
> > > #define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
> > >
> > > #endif /* CONFIG_SMP */
> >
> > /me thinks you should merge this patch with patch 1. Otherwise there is no
> > hard_smp_processor_id() defined on any architecture if only patch 1 is
> > applied. That would break a git bisect search.
> Hi Heiko,
>
> Thank you for reviewing the patch-set. The patches have already been
> merged in Andrew's tree but I will take your advice into account when
> submitting new patches. I certainly would not like to break bisect
> searches.
>
I swizzled your patches around so the bisect problem should be gone.
At least, the one which Heiko identified - there might be others.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um
2007-03-02 8:39 ` Andrew Morton
@ 2007-03-02 8:43 ` Fernando Luis Vázquez Cao
0 siblings, 0 replies; 5+ messages in thread
From: Fernando Luis Vázquez Cao @ 2007-03-02 8:43 UTC (permalink / raw)
To: Andrew Morton
Cc: Heiko Carstens, Linux Kernel Mailing List, fastboot, ebiederm,
ak, judith
On Fri, 2007-03-02 at 00:39 -0800, Andrew Morton wrote:
> On Fri, 02 Mar 2007 17:31:21 +0900 Fernando Luis Vázquez Cao <fernando@oss.ntt.co.jp> wrote:
>
> > On Thu, 2007-03-01 at 10:03 +0100, Heiko Carstens wrote:
> > > On Thu, Mar 01, 2007 at 04:18:23PM +0900, Fernando Luis Vázquez Cao wrote:
> > > > Move definition of hard_smp_processor_id to asm/smp.h on alpha, m32r,
> > > > powerpc, s390, sparc, sparc64, and um architectures.
> > > >
> > > > Signed-off-by: Fernando Luis Vazquez Cao <fernando@oss.ntt.co.jp>
> > > > ---
> > > >
> > > > diff -urNp linux-2.6.21-rc2/include/asm-alpha/smp.h linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h
> > > > --- linux-2.6.21-rc2/include/asm-alpha/smp.h 2007-02-05 03:44:54.000000000 +0900
> > > > +++ linux-2.6.21-rc2-hwcpuid/include/asm-alpha/smp.h 2007-03-07 13:34:14.000000000 +0900
> > > > @@ -51,6 +51,7 @@ int smp_call_function_on_cpu(void (*func
> > > >
> > > > #else /* CONFIG_SMP */
> > > >
> > > > +#define hard_smp_processor_id() 0
> > > > #define smp_call_function_on_cpu(func,info,retry,wait,cpu) ({ 0; })
> > > >
> > > > #endif /* CONFIG_SMP */
> > >
> > > /me thinks you should merge this patch with patch 1. Otherwise there is no
> > > hard_smp_processor_id() defined on any architecture if only patch 1 is
> > > applied. That would break a git bisect search.
> > Hi Heiko,
> >
> > Thank you for reviewing the patch-set. The patches have already been
> > merged in Andrew's tree but I will take your advice into account when
> > submitting new patches. I certainly would not like to break bisect
> > searches.
> >
>
> I swizzled your patches around so the bisect problem should be gone.
>
> At least, the one which Heiko identified - there might be others.
Thank you for fixing that Andrew. I have doubled checked and there
should not be any other issues.
Fernando
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-03-02 8:42 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-01 7:18 [PATCH 5/5] Move definition of hard_smp_processor_id to asm/smp.h - alpha, m32r, powerpc, s390, sparc, sparc64, um Fernando Luis Vázquez Cao
2007-03-01 9:03 ` Heiko Carstens
2007-03-02 8:31 ` Fernando Luis Vázquez Cao
2007-03-02 8:39 ` Andrew Morton
2007-03-02 8:43 ` Fernando Luis Vázquez Cao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).