summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2008-11-16 12:04:13 +0100
committerKyle McMartin <kyle@hera.kernel.org>2008-11-26 22:22:36 +0000
commit9860d1b08b082ffb54c4b7827c48c2728e12ba21 (patch)
treeefc5e0aa67d2fbf02f5b4ac51d9afc4f37b7bec1 /arch
parented313489badef16d700f5a3be50e8fd8f8294bc8 (diff)
downloadop-kernel-dev-9860d1b08b082ffb54c4b7827c48c2728e12ba21.zip
op-kernel-dev-9860d1b08b082ffb54c4b7827c48c2728e12ba21.tar.gz
parisc: __kernel_time_t is always long
__kernel_time_t is always long on PA-RISC, irrespective of CONFIG_64BIT, hence move it out of the #ifdef CONFIG_64BIT / #else / #endif block. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/include/asm/posix_types.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/include/asm/posix_types.h b/arch/parisc/include/asm/posix_types.h
index bb725a6..00da29a 100644
--- a/arch/parisc/include/asm/posix_types.h
+++ b/arch/parisc/include/asm/posix_types.h
@@ -24,13 +24,12 @@ typedef int __kernel_daddr_t;
typedef unsigned long __kernel_size_t;
typedef long __kernel_ssize_t;
typedef long __kernel_ptrdiff_t;
-typedef long __kernel_time_t;
#else
typedef unsigned int __kernel_size_t;
typedef int __kernel_ssize_t;
typedef int __kernel_ptrdiff_t;
-typedef long __kernel_time_t;
#endif
+typedef long __kernel_time_t;
typedef char * __kernel_caddr_t;
typedef unsigned short __kernel_uid16_t;
OpenPOWER on IntegriCloud