Commit 848f12d6 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] s390: fix kmem_bufctl_t definition

From: Arnd Bergmann <arnd@arndb.de>

On s390, kmem_bufctl_t was added inside of an #ifdef, breaking
64 bit builds.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7278aee3
...@@ -79,6 +79,8 @@ typedef unsigned long u64; ...@@ -79,6 +79,8 @@ typedef unsigned long u64;
typedef u32 dma_addr_t; typedef u32 dma_addr_t;
typedef unsigned int kmem_bufctl_t;
#ifndef __s390x__ #ifndef __s390x__
typedef union { typedef union {
unsigned long long pair; unsigned long long pair;
...@@ -93,8 +95,6 @@ typedef u64 sector_t; ...@@ -93,8 +95,6 @@ typedef u64 sector_t;
#define HAVE_SECTOR_T #define HAVE_SECTOR_T
#endif #endif
typedef unsigned int kmem_bufctl_t;
#endif /* ! __s390x__ */ #endif /* ! __s390x__ */
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment