[PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[Manish Lachwani]

[-- Attachment #1: Type: text/plain, Size: 159 bytes --]

Hi Ralf,

The attached patch is needed to prevent the compilation warnings that
occur when using 2.6.10-rc3 on Sibyte. Please review 

Thanks
Manish Lachwani


[-- Attachment #2: patch-2610rc3-sibyte --]
[-- Type: text/plain, Size: 451 bytes --]

--- include/asm-mips/cpu-features.h.orig	2004-12-15 11:18:23.000000000 -0800
+++ include/asm-mips/cpu-features.h	2004-12-15 11:18:43.000000000 -0800
@@ -92,8 +92,10 @@
 #define cpu_icache_snoops_remote_store	(cpu_data[0].icache.flags & MIPS_IC_SNOOPS_REMOTE)
 #endif
 #else
+#ifndef cpu_icache_snoops_remote_store
 #define cpu_icache_snoops_remote_store	1
 #endif
+#endif
 
 /*
  * Certain CPUs may throw bizarre exceptions if not the whole cacheline

Re: [PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[Steven J. Hill]

Manish Lachwani wrote:
> 
> The attached patch is needed to prevent the compilation warnings that
> occur when using 2.6.10-rc3 on Sibyte. Please review 
> 
I don't ever see any warning associated with this. Can you provide a
little more information?

-Steve

Re: [PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[Manish Lachwani]

Steven J. Hill wrote:

> Manish Lachwani wrote:
>
>>
>> The attached patch is needed to prevent the compilation warnings that
>> occur when using 2.6.10-rc3 on Sibyte. Please review
>
> I don't ever see any warning associated with this. Can you provide a
> little more information?
>
> -Steve
>
Hi Steve,

When did you last sync with CVS?  There was a change introduced : 
http://www.linux-mips.org/cvsweb/linux/include/asm-mips/mach-sibyte/cpu-feature-overrides.h.diff?r1=1.1&r2=1.2

There is another #define in include/asm-mips/

#ifdef CONFIG_SMP
#ifndef cpu_icache_snoops_remote_store
#define cpu_icache_snoops_remote_store  (cpu_data[0].icache.flags & 
MIPS_IC_SNOOPS_REMOTE)
#endif
#else
#define cpu_icache_snoops_remote_store  1
#endif

And if running Sibyte in UP mode, cpu_icache_snoops_remote_store is 
redefined

Thanks
Manish

Re: [PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[Steven J. Hill]

[-- Attachment #1: Type: text/plain, Size: 371 bytes --]

Manish Lachwani wrote:
> 
> When did you last sync with CVS?  There was a change introduced : 
>
Literally 10 minutes ago and I did a fresh compile.

> And if running Sibyte in UP mode, cpu_icache_snoops_remote_store is 
> redefined
> 
I do not run in UP mode, so that is why I did not see it. I suggest
a different version attached. How does that work for you?

-Steve


[-- Attachment #2: cpu-feature-warn.patch --]
[-- Type: text/x-patch, Size: 741 bytes --]

Index: cpu-features.h
===================================================================
RCS file: /home/cvs/linux/include/asm-mips/cpu-features.h,v
retrieving revision 1.9
diff -u -r1.9 cpu-features.h
--- cpu-features.h	7 Dec 2004 02:08:34 -0000	1.9
+++ cpu-features.h	16 Dec 2004 03:42:03 -0000
@@ -87,13 +87,13 @@
  * that did the store so we can't optimize this into only doing the flush on
  * the local CPU.
  */
-#ifdef CONFIG_SMP
 #ifndef cpu_icache_snoops_remote_store
+#ifdef CONFIG_SMP
 #define cpu_icache_snoops_remote_store	(cpu_data[0].icache.flags & MIPS_IC_SNOOPS_REMOTE)
-#endif
 #else
 #define cpu_icache_snoops_remote_store	1
 #endif
+#endif
 
 /*
  * Certain CPUs may throw bizarre exceptions if not the whole cacheline

Re: [PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[Manish Lachwani]

Steven J. Hill wrote:

> Manish Lachwani wrote:
>
>>
>> When did you last sync with CVS?  There was a change introduced :
>
> Literally 10 minutes ago and I did a fresh compile.
>
>> And if running Sibyte in UP mode, cpu_icache_snoops_remote_store is 
>> redefined
>>
> I do not run in UP mode, so that is why I did not see it. I suggest
> a different version attached. How does that work for you?
>
> -Steve
>
>------------------------------------------------------------------------
>
>Index: cpu-features.h
>===================================================================
>RCS file: /home/cvs/linux/include/asm-mips/cpu-features.h,v
>retrieving revision 1.9
>diff -u -r1.9 cpu-features.h
>--- cpu-features.h	7 Dec 2004 02:08:34 -0000	1.9
>+++ cpu-features.h	16 Dec 2004 03:42:03 -0000
>@@ -87,13 +87,13 @@
>  * that did the store so we can't optimize this into only doing the flush on
>  * the local CPU.
>  */
>-#ifdef CONFIG_SMP
> #ifndef cpu_icache_snoops_remote_store
>+#ifdef CONFIG_SMP
> #define cpu_icache_snoops_remote_store	(cpu_data[0].icache.flags & MIPS_IC_SNOOPS_REMOTE)
>-#endif
> #else
> #define cpu_icache_snoops_remote_store	1
> #endif
>+#endif
> 
> /*
>  * Certain CPUs may throw bizarre exceptions if not the whole cacheline
>  
>
Looks good to me

Thanks
Manish Lachwani

Re: [PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[Manish Lachwani]

On a side note, I think this problem will appear on other arches as well 
when running in UP mode.

Thanks
Manish Lachwani


Steven J. Hill wrote:

> Manish Lachwani wrote:
>
>>
>> When did you last sync with CVS?  There was a change introduced :
>
> Literally 10 minutes ago and I did a fresh compile.
>
>> And if running Sibyte in UP mode, cpu_icache_snoops_remote_store is 
>> redefined
>>
> I do not run in UP mode, so that is why I did not see it. I suggest
> a different version attached. How does that work for you?
>
> -Steve
>
>------------------------------------------------------------------------
>
>Index: cpu-features.h
>===================================================================
>RCS file: /home/cvs/linux/include/asm-mips/cpu-features.h,v
>retrieving revision 1.9
>diff -u -r1.9 cpu-features.h
>--- cpu-features.h	7 Dec 2004 02:08:34 -0000	1.9
>+++ cpu-features.h	16 Dec 2004 03:42:03 -0000
>@@ -87,13 +87,13 @@
>  * that did the store so we can't optimize this into only doing the flush on
>  * the local CPU.
>  */
>-#ifdef CONFIG_SMP
> #ifndef cpu_icache_snoops_remote_store
>+#ifdef CONFIG_SMP
> #define cpu_icache_snoops_remote_store	(cpu_data[0].icache.flags & MIPS_IC_SNOOPS_REMOTE)
>-#endif
> #else
> #define cpu_icache_snoops_remote_store	1
> #endif
>+#endif
> 
> /*
>  * Certain CPUs may throw bizarre exceptions if not the whole cacheline
>  
>

Re: [PATCH] Avoid compile warnings on Sibyte using 2.6.10-rc3

[Maciej W. Rozycki]

On Wed, 15 Dec 2004, Steven J. Hill wrote:

> I do not run in UP mode, so that is why I did not see it. I suggest
> a different version attached. How does that work for you?

 This begs for indentation. ;-)

  Maciej