[PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Benjamin Herrenschmidt]

Hi !

sector_t depends on CONFIG_LBD but include/config.h may not be there
thus causing interesting breakage in some places...

Here's the fix for ppc32 (problem found by Roman Zippel, other archs
need a similar fix).

diff -urN linux-2.5/include/asm-ppc/types.h linuxppc-2.5-benh/include/asm-ppc/types.h
--- linux-2.5/include/asm-ppc/types.h	2004-03-01 18:13:06.000000000 +1100
+++ linuxppc-2.5-benh/include/asm-ppc/types.h	2004-03-29 13:14:50.000000000 +1000
@@ -37,6 +37,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <linux/config.h>
+
 typedef signed char s8;
 typedef unsigned char u8;
 

Re: [PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Andrew Morton]

Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
>
>  sector_t depends on CONFIG_LBD but include/config.h may not be there
>  thus causing interesting breakage in some places...

Nasty.

>  Here's the fix for ppc32 (problem found by Roman Zippel, other archs
>  need a similar fix).

Three of them.

 25-akpm/include/asm-s390/types.h   |    2 ++
 25-akpm/include/asm-sh/types.h     |    2 ++
 25-akpm/include/asm-x86_64/types.h |    2 ++
 3 files changed, 6 insertions(+)

diff -puN include/asm-s390/types.h~types_h-needs-config_h include/asm-s390/types.h
--- 25/include/asm-s390/types.h~types_h-needs-config_h	2004-03-28 23:02:57.481365480 -0800
+++ 25-akpm/include/asm-s390/types.h	2004-03-28 23:02:57.486364720 -0800
@@ -50,6 +50,8 @@ typedef __signed__ long saddr_t;
  */
 #ifdef __KERNEL__
 
+#include <linux/config.h>
+
 #ifndef __s390x__
 #define BITS_PER_LONG 32
 #else
diff -puN include/asm-sh/types.h~types_h-needs-config_h include/asm-sh/types.h
--- 25/include/asm-sh/types.h~types_h-needs-config_h	2004-03-28 23:02:57.482365328 -0800
+++ 25-akpm/include/asm-sh/types.h	2004-03-28 23:02:57.486364720 -0800
@@ -31,6 +31,8 @@ typedef unsigned long long __u64;
  */
 #ifdef __KERNEL__
 
+#include <linux/config.h>
+
 #define BITS_PER_LONG 32
 
 #ifndef __ASSEMBLY__
diff -puN include/asm-x86_64/types.h~types_h-needs-config_h include/asm-x86_64/types.h
--- 25/include/asm-x86_64/types.h~types_h-needs-config_h	2004-03-28 23:02:57.484365024 -0800
+++ 25-akpm/include/asm-x86_64/types.h	2004-03-28 23:02:57.486364720 -0800
@@ -29,6 +29,8 @@ typedef unsigned long long  __u64;
  */
 #ifdef __KERNEL__
 
+#include <linux/config.h>
+
 #define BITS_PER_LONG 64
 
 #ifndef __ASSEMBLY__

_

Re: [PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Andi Kleen]

Andrew Morton <akpm@osdl.org> writes:

> Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> >
> >  sector_t depends on CONFIG_LBD but include/config.h may not be there
> >  thus causing interesting breakage in some places...
> 
> Nasty.
> 
> >  Here's the fix for ppc32 (problem found by Roman Zippel, other archs
> >  need a similar fix).
> 
> Three of them.
> 
>  25-akpm/include/asm-s390/types.h   |    2 ++
>  25-akpm/include/asm-sh/types.h     |    2 ++
>  25-akpm/include/asm-x86_64/types.h |    2 ++

Please use this change for x86-64 instead.

-Andi

diff -u linux-2.6.5rc2-amd64/include/asm-x86_64/types.h-o linux-2.6.5rc2-amd64/include/asm-x86_64/types.h
--- linux-2.6.5rc2-amd64/include/asm-x86_64/types.h-o	2004-03-21 21:11:54.000000000 +0100
+++ linux-2.6.5rc2-amd64/include/asm-x86_64/types.h	2004-03-29 04:44:24.000000000 +0200
@@ -48,10 +48,8 @@
 typedef u64 dma64_addr_t;
 typedef u64 dma_addr_t;
 
-#ifdef CONFIG_LBD
 typedef u64 sector_t;
 #define HAVE_SECTOR_T
-#endif
 
 #endif /* __ASSEMBLY__ */
 

Re: [PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Andi Kleen]

On Mon, 29 Mar 2004 23:18:23 +1000
Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:

> 
> >  
> > -#ifdef CONFIG_LBD
> >  typedef u64 sector_t;
> >  #define HAVE_SECTOR_T
> > -#endif
> 
> Do you need that at all then ? The default unsigned long should
> be just fine...

True, it could be completely dropped too.

-Andi

Re: [PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Anton Blanchard]

On Sun, Mar 28, 2004 at 11:03:51PM -0800, Andrew Morton wrote:
> Benjamin Herrenschmidt <benh@kernel.crashing.org> wrote:
> >
> >  sector_t depends on CONFIG_LBD but include/config.h may not be there
> >  thus causing interesting breakage in some places...
> 
> Nasty.

Dont forget trusty old linux/scripts/checkconfig.pl.

Anton

Re: [PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Benjamin Herrenschmidt]

>  
> -#ifdef CONFIG_LBD
>  typedef u64 sector_t;
>  #define HAVE_SECTOR_T
> -#endif

Do you need that at all then ? The default unsigned long should
be just fine...

Ben.

Re: [PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Christoph Hellwig]

On Sun, Mar 28, 2004 at 11:03:51PM -0800, Andrew Morton wrote:
> >  Here's the fix for ppc32 (problem found by Roman Zippel, other archs
> >  need a similar fix).
> 
> Three of them.

Why do we keep thios in asm-*/types.h instead of linux/types.h, btw?

Re: [PATCH] ppc32: Fix sector_t definition with CONFIG_LBD

[Michel Roelofs]

> sector_t depends on CONFIG_LBD but include/config.h may not be there
> thus causing interesting breakage in some places... 
> Here's the fix for ppc32 (problem found by Roman Zippel, other archs
> need a similar fix).

This indeed solves the oops when mounting an HFS fs on my ppc32.