aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/traps.c
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2007-01-28 08:58:52 -0500
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-02-17 01:16:40 -0500
commita8f44e3889b686813926b288bd4e51a0cf17d2c7 (patch)
treef6c4078aecbe33274bf1c1cff4c9e18a8ed90eaf /arch/parisc/kernel/traps.c
parent0b3d643f9ead9b5141dedbb2d1b06ce15469fc4a (diff)
[PARISC] use CONFIG_64BIT instead of __LP64__
- additionally update my copyright timestamps Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc/kernel/traps.c')
-rw-r--r--arch/parisc/kernel/traps.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 1f62853e4c02..55bc1471967d 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -64,7 +64,7 @@ static int printbinary(char *buf, unsigned long x, int nbits)
64 return nbits; 64 return nbits;
65} 65}
66 66
67#ifdef __LP64__ 67#ifdef CONFIG_64BIT
68#define RFMT "%016lx" 68#define RFMT "%016lx"
69#else 69#else
70#define RFMT "%08lx" 70#define RFMT "%08lx"
@@ -837,7 +837,7 @@ int __init check_ivt(void *iva)
837 return 0; 837 return 0;
838} 838}
839 839
840#ifndef __LP64__ 840#ifndef CONFIG_64BIT
841extern const void fault_vector_11; 841extern const void fault_vector_11;
842#endif 842#endif
843extern const void fault_vector_20; 843extern const void fault_vector_20;
@@ -849,7 +849,7 @@ void __init trap_init(void)
849 if (boot_cpu_data.cpu_type >= pcxu) 849 if (boot_cpu_data.cpu_type >= pcxu)
850 iva = (void *) &fault_vector_20; 850 iva = (void *) &fault_vector_20;
851 else 851 else
852#ifdef __LP64__ 852#ifdef CONFIG_64BIT
853 panic("Can't boot 64-bit OS on PA1.1 processor!"); 853 panic("Can't boot 64-bit OS on PA1.1 processor!");
854#else 854#else
855 iva = (void *) &fault_vector_11; 855 iva = (void *) &fault_vector_11;