diff options
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/asm-offsets.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/firmware.c | 26 | ||||
-rw-r--r-- | arch/parisc/kernel/inventory.c | 10 | ||||
-rw-r--r-- | arch/parisc/kernel/module.c | 16 | ||||
-rw-r--r-- | arch/parisc/kernel/parisc_ksyms.c | 10 | ||||
-rw-r--r-- | arch/parisc/kernel/process.c | 4 | ||||
-rw-r--r-- | arch/parisc/kernel/processor.c | 6 | ||||
-rw-r--r-- | arch/parisc/kernel/ptrace.c | 10 | ||||
-rw-r--r-- | arch/parisc/kernel/setup.c | 6 | ||||
-rw-r--r-- | arch/parisc/kernel/signal.c | 24 | ||||
-rw-r--r-- | arch/parisc/kernel/syscall_table.S | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/traps.c | 6 |
12 files changed, 61 insertions, 61 deletions
diff --git a/arch/parisc/kernel/asm-offsets.c b/arch/parisc/kernel/asm-offsets.c index c11a5bc7c067..54fdb959149c 100644 --- a/arch/parisc/kernel/asm-offsets.c +++ b/arch/parisc/kernel/asm-offsets.c | |||
@@ -44,7 +44,7 @@ | |||
44 | 44 | ||
45 | #define BLANK() asm volatile("\n->" : : ) | 45 | #define BLANK() asm volatile("\n->" : : ) |
46 | 46 | ||
47 | #ifdef __LP64__ | 47 | #ifdef CONFIG_64BIT |
48 | #define FRAME_SIZE 128 | 48 | #define FRAME_SIZE 128 |
49 | #else | 49 | #else |
50 | #define FRAME_SIZE 64 | 50 | #define FRAME_SIZE 64 |
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index 9158b707c0dd..39dc835bf89e 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c | |||
@@ -74,7 +74,7 @@ static DEFINE_SPINLOCK(pdc_lock); | |||
74 | static unsigned long pdc_result[32] __attribute__ ((aligned (8))); | 74 | static unsigned long pdc_result[32] __attribute__ ((aligned (8))); |
75 | static unsigned long pdc_result2[32] __attribute__ ((aligned (8))); | 75 | static unsigned long pdc_result2[32] __attribute__ ((aligned (8))); |
76 | 76 | ||
77 | #ifdef __LP64__ | 77 | #ifdef CONFIG_64BIT |
78 | #define WIDE_FIRMWARE 0x1 | 78 | #define WIDE_FIRMWARE 0x1 |
79 | #define NARROW_FIRMWARE 0x2 | 79 | #define NARROW_FIRMWARE 0x2 |
80 | 80 | ||
@@ -94,12 +94,12 @@ int parisc_narrow_firmware __read_mostly = 1; | |||
94 | * when running a 64-bit kernel on such boxes (e.g. C200 or C360). | 94 | * when running a 64-bit kernel on such boxes (e.g. C200 or C360). |
95 | */ | 95 | */ |
96 | 96 | ||
97 | #ifdef __LP64__ | 97 | #ifdef CONFIG_64BIT |
98 | long real64_call(unsigned long function, ...); | 98 | long real64_call(unsigned long function, ...); |
99 | #endif | 99 | #endif |
100 | long real32_call(unsigned long function, ...); | 100 | long real32_call(unsigned long function, ...); |
101 | 101 | ||
102 | #ifdef __LP64__ | 102 | #ifdef CONFIG_64BIT |
103 | # define MEM_PDC (unsigned long)(PAGE0->mem_pdc_hi) << 32 | PAGE0->mem_pdc | 103 | # define MEM_PDC (unsigned long)(PAGE0->mem_pdc_hi) << 32 | PAGE0->mem_pdc |
104 | # define mem_pdc_call(args...) unlikely(parisc_narrow_firmware) ? real32_call(MEM_PDC, args) : real64_call(MEM_PDC, args) | 104 | # define mem_pdc_call(args...) unlikely(parisc_narrow_firmware) ? real32_call(MEM_PDC, args) : real64_call(MEM_PDC, args) |
105 | #else | 105 | #else |
@@ -117,7 +117,7 @@ long real32_call(unsigned long function, ...); | |||
117 | */ | 117 | */ |
118 | static unsigned long f_extend(unsigned long address) | 118 | static unsigned long f_extend(unsigned long address) |
119 | { | 119 | { |
120 | #ifdef __LP64__ | 120 | #ifdef CONFIG_64BIT |
121 | if(unlikely(parisc_narrow_firmware)) { | 121 | if(unlikely(parisc_narrow_firmware)) { |
122 | if((address & 0xff000000) == 0xf0000000) | 122 | if((address & 0xff000000) == 0xf0000000) |
123 | return 0xf0f0f0f000000000UL | (u32)address; | 123 | return 0xf0f0f0f000000000UL | (u32)address; |
@@ -139,7 +139,7 @@ static unsigned long f_extend(unsigned long address) | |||
139 | */ | 139 | */ |
140 | static void convert_to_wide(unsigned long *addr) | 140 | static void convert_to_wide(unsigned long *addr) |
141 | { | 141 | { |
142 | #ifdef __LP64__ | 142 | #ifdef CONFIG_64BIT |
143 | int i; | 143 | int i; |
144 | unsigned int *p = (unsigned int *)addr; | 144 | unsigned int *p = (unsigned int *)addr; |
145 | 145 | ||
@@ -158,7 +158,7 @@ static void convert_to_wide(unsigned long *addr) | |||
158 | */ | 158 | */ |
159 | void __init set_firmware_width(void) | 159 | void __init set_firmware_width(void) |
160 | { | 160 | { |
161 | #ifdef __LP64__ | 161 | #ifdef CONFIG_64BIT |
162 | int retval; | 162 | int retval; |
163 | unsigned long flags; | 163 | unsigned long flags; |
164 | 164 | ||
@@ -238,7 +238,7 @@ int __init pdc_chassis_info(struct pdc_chassis_info *chassis_info, void *led_inf | |||
238 | * | 238 | * |
239 | * Must be correctly formatted or expect system crash | 239 | * Must be correctly formatted or expect system crash |
240 | */ | 240 | */ |
241 | #ifdef __LP64__ | 241 | #ifdef CONFIG_64BIT |
242 | int pdc_pat_chassis_send_log(unsigned long state, unsigned long data) | 242 | int pdc_pat_chassis_send_log(unsigned long state, unsigned long data) |
243 | { | 243 | { |
244 | int retval = 0; | 244 | int retval = 0; |
@@ -949,7 +949,7 @@ int pdc_tod_set(unsigned long sec, unsigned long usec) | |||
949 | } | 949 | } |
950 | EXPORT_SYMBOL(pdc_tod_set); | 950 | EXPORT_SYMBOL(pdc_tod_set); |
951 | 951 | ||
952 | #ifdef __LP64__ | 952 | #ifdef CONFIG_64BIT |
953 | int pdc_mem_mem_table(struct pdc_memory_table_raddr *r_addr, | 953 | int pdc_mem_mem_table(struct pdc_memory_table_raddr *r_addr, |
954 | struct pdc_memory_table *tbl, unsigned long entries) | 954 | struct pdc_memory_table *tbl, unsigned long entries) |
955 | { | 955 | { |
@@ -965,7 +965,7 @@ int pdc_mem_mem_table(struct pdc_memory_table_raddr *r_addr, | |||
965 | 965 | ||
966 | return retval; | 966 | return retval; |
967 | } | 967 | } |
968 | #endif /* __LP64__ */ | 968 | #endif /* CONFIG_64BIT */ |
969 | 969 | ||
970 | /* FIXME: Is this pdc used? I could not find type reference to ftc_bitmap | 970 | /* FIXME: Is this pdc used? I could not find type reference to ftc_bitmap |
971 | * so I guessed at unsigned long. Someone who knows what this does, can fix | 971 | * so I guessed at unsigned long. Someone who knows what this does, can fix |
@@ -1204,7 +1204,7 @@ int pdc_sti_call(unsigned long func, unsigned long flags, | |||
1204 | } | 1204 | } |
1205 | EXPORT_SYMBOL(pdc_sti_call); | 1205 | EXPORT_SYMBOL(pdc_sti_call); |
1206 | 1206 | ||
1207 | #ifdef __LP64__ | 1207 | #ifdef CONFIG_64BIT |
1208 | /** | 1208 | /** |
1209 | * pdc_pat_cell_get_number - Returns the cell number. | 1209 | * pdc_pat_cell_get_number - Returns the cell number. |
1210 | * @cell_info: The return buffer. | 1210 | * @cell_info: The return buffer. |
@@ -1387,7 +1387,7 @@ int pdc_pat_io_pci_cfg_write(unsigned long pci_addr, int pci_size, u32 val) | |||
1387 | 1387 | ||
1388 | return retval; | 1388 | return retval; |
1389 | } | 1389 | } |
1390 | #endif /* __LP64__ */ | 1390 | #endif /* CONFIG_64BIT */ |
1391 | 1391 | ||
1392 | 1392 | ||
1393 | /***************** 32-bit real-mode calls ***********/ | 1393 | /***************** 32-bit real-mode calls ***********/ |
@@ -1445,7 +1445,7 @@ long real32_call(unsigned long fn, ...) | |||
1445 | return real32_call_asm(&real_stack.sp, &real_stack.arg0, fn); | 1445 | return real32_call_asm(&real_stack.sp, &real_stack.arg0, fn); |
1446 | } | 1446 | } |
1447 | 1447 | ||
1448 | #ifdef __LP64__ | 1448 | #ifdef CONFIG_64BIT |
1449 | /***************** 64-bit real-mode calls ***********/ | 1449 | /***************** 64-bit real-mode calls ***********/ |
1450 | 1450 | ||
1451 | struct wide_stack { | 1451 | struct wide_stack { |
@@ -1496,5 +1496,5 @@ long real64_call(unsigned long fn, ...) | |||
1496 | return real64_call_asm(&real64_stack.sp, &real64_stack.arg0, fn); | 1496 | return real64_call_asm(&real64_stack.sp, &real64_stack.arg0, fn); |
1497 | } | 1497 | } |
1498 | 1498 | ||
1499 | #endif /* __LP64__ */ | 1499 | #endif /* CONFIG_64BIT */ |
1500 | 1500 | ||
diff --git a/arch/parisc/kernel/inventory.c b/arch/parisc/kernel/inventory.c index 4e847ba53180..4845a6444633 100644 --- a/arch/parisc/kernel/inventory.c +++ b/arch/parisc/kernel/inventory.c | |||
@@ -47,7 +47,7 @@ void __init setup_pdc(void) | |||
47 | struct pdc_system_map_mod_info module_result; | 47 | struct pdc_system_map_mod_info module_result; |
48 | struct pdc_module_path module_path; | 48 | struct pdc_module_path module_path; |
49 | struct pdc_model model; | 49 | struct pdc_model model; |
50 | #ifdef __LP64__ | 50 | #ifdef CONFIG_64BIT |
51 | struct pdc_pat_cell_num cell_info; | 51 | struct pdc_pat_cell_num cell_info; |
52 | #endif | 52 | #endif |
53 | 53 | ||
@@ -73,7 +73,7 @@ void __init setup_pdc(void) | |||
73 | * clearer message. | 73 | * clearer message. |
74 | */ | 74 | */ |
75 | 75 | ||
76 | #ifdef __LP64__ | 76 | #ifdef CONFIG_64BIT |
77 | status = pdc_pat_cell_get_number(&cell_info); | 77 | status = pdc_pat_cell_get_number(&cell_info); |
78 | if (status == PDC_OK) { | 78 | if (status == PDC_OK) { |
79 | pdc_type = PDC_TYPE_PAT; | 79 | pdc_type = PDC_TYPE_PAT; |
@@ -152,7 +152,7 @@ static void __init pagezero_memconfig(void) | |||
152 | npmem_ranges = 1; | 152 | npmem_ranges = 1; |
153 | } | 153 | } |
154 | 154 | ||
155 | #ifdef __LP64__ | 155 | #ifdef CONFIG_64BIT |
156 | 156 | ||
157 | /* All of the PDC PAT specific code is 64-bit only */ | 157 | /* All of the PDC PAT specific code is 64-bit only */ |
158 | 158 | ||
@@ -408,13 +408,13 @@ static void __init sprockets_memconfig(void) | |||
408 | } | 408 | } |
409 | } | 409 | } |
410 | 410 | ||
411 | #else /* !__LP64__ */ | 411 | #else /* !CONFIG_64BIT */ |
412 | 412 | ||
413 | #define pat_inventory() do { } while (0) | 413 | #define pat_inventory() do { } while (0) |
414 | #define pat_memconfig() do { } while (0) | 414 | #define pat_memconfig() do { } while (0) |
415 | #define sprockets_memconfig() pagezero_memconfig() | 415 | #define sprockets_memconfig() pagezero_memconfig() |
416 | 416 | ||
417 | #endif /* !__LP64__ */ | 417 | #endif /* !CONFIG_64BIT */ |
418 | 418 | ||
419 | 419 | ||
420 | #ifndef CONFIG_PA20 | 420 | #ifndef CONFIG_PA20 |
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index 1808f857a73a..fdacdd4341c9 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c | |||
@@ -97,7 +97,7 @@ static inline int in_local_section(struct module *me, void *loc, void *dot) | |||
97 | } | 97 | } |
98 | 98 | ||
99 | 99 | ||
100 | #ifndef __LP64__ | 100 | #ifndef CONFIG_64BIT |
101 | struct got_entry { | 101 | struct got_entry { |
102 | Elf32_Addr addr; | 102 | Elf32_Addr addr; |
103 | }; | 103 | }; |
@@ -177,7 +177,7 @@ void *module_alloc(unsigned long size) | |||
177 | return vmalloc(size); | 177 | return vmalloc(size); |
178 | } | 178 | } |
179 | 179 | ||
180 | #ifndef __LP64__ | 180 | #ifndef CONFIG_64BIT |
181 | static inline unsigned long count_gots(const Elf_Rela *rela, unsigned long n) | 181 | static inline unsigned long count_gots(const Elf_Rela *rela, unsigned long n) |
182 | { | 182 | { |
183 | return 0; | 183 | return 0; |
@@ -320,7 +320,7 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr, | |||
320 | return 0; | 320 | return 0; |
321 | } | 321 | } |
322 | 322 | ||
323 | #ifdef __LP64__ | 323 | #ifdef CONFIG_64BIT |
324 | static Elf64_Word get_got(struct module *me, unsigned long value, long addend) | 324 | static Elf64_Word get_got(struct module *me, unsigned long value, long addend) |
325 | { | 325 | { |
326 | unsigned int i; | 326 | unsigned int i; |
@@ -343,9 +343,9 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend) | |||
343 | value); | 343 | value); |
344 | return i * sizeof(struct got_entry); | 344 | return i * sizeof(struct got_entry); |
345 | } | 345 | } |
346 | #endif /* __LP64__ */ | 346 | #endif /* CONFIG_64BIT */ |
347 | 347 | ||
348 | #ifdef __LP64__ | 348 | #ifdef CONFIG_64BIT |
349 | static Elf_Addr get_fdesc(struct module *me, unsigned long value) | 349 | static Elf_Addr get_fdesc(struct module *me, unsigned long value) |
350 | { | 350 | { |
351 | Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset; | 351 | Elf_Fdesc *fdesc = me->module_core + me->arch.fdesc_offset; |
@@ -369,7 +369,7 @@ static Elf_Addr get_fdesc(struct module *me, unsigned long value) | |||
369 | fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset; | 369 | fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset; |
370 | return (Elf_Addr)fdesc; | 370 | return (Elf_Addr)fdesc; |
371 | } | 371 | } |
372 | #endif /* __LP64__ */ | 372 | #endif /* CONFIG_64BIT */ |
373 | 373 | ||
374 | enum elf_stub_type { | 374 | enum elf_stub_type { |
375 | ELF_STUB_GOT, | 375 | ELF_STUB_GOT, |
@@ -395,7 +395,7 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend, | |||
395 | i * sizeof(struct stub_entry); | 395 | i * sizeof(struct stub_entry); |
396 | } | 396 | } |
397 | 397 | ||
398 | #ifndef __LP64__ | 398 | #ifndef CONFIG_64BIT |
399 | /* for 32-bit the stub looks like this: | 399 | /* for 32-bit the stub looks like this: |
400 | * ldil L'XXX,%r1 | 400 | * ldil L'XXX,%r1 |
401 | * be,n R'XXX(%sr4,%r1) | 401 | * be,n R'XXX(%sr4,%r1) |
@@ -473,7 +473,7 @@ int apply_relocate(Elf_Shdr *sechdrs, | |||
473 | return -ENOEXEC; | 473 | return -ENOEXEC; |
474 | } | 474 | } |
475 | 475 | ||
476 | #ifndef __LP64__ | 476 | #ifndef CONFIG_64BIT |
477 | int apply_relocate_add(Elf_Shdr *sechdrs, | 477 | int apply_relocate_add(Elf_Shdr *sechdrs, |
478 | const char *strtab, | 478 | const char *strtab, |
479 | unsigned int symindex, | 479 | unsigned int symindex, |
diff --git a/arch/parisc/kernel/parisc_ksyms.c b/arch/parisc/kernel/parisc_ksyms.c index 8f6a0b312f7a..7aca704e96f0 100644 --- a/arch/parisc/kernel/parisc_ksyms.c +++ b/arch/parisc/kernel/parisc_ksyms.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * Copyright (C) 2001-2003 Grant Grundler <grundler with parisc-linux.org> | 7 | * Copyright (C) 2001-2003 Grant Grundler <grundler with parisc-linux.org> |
8 | * Copyright (C) 2002-2003 Matthew Wilcox <willy at parisc-linux.org> | 8 | * Copyright (C) 2002-2003 Matthew Wilcox <willy at parisc-linux.org> |
9 | * Copyright (C) 2002 Randolph Chung <tausq at parisc-linux.org> | 9 | * Copyright (C) 2002 Randolph Chung <tausq at parisc-linux.org> |
10 | * Copyright (C) 2002-2003 Helge Deller <deller with parisc-linux.org> | 10 | * Copyright (C) 2002-2007 Helge Deller <deller with parisc-linux.org> |
11 | * | 11 | * |
12 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
13 | * it under the terms of the GNU General Public License as published by | 13 | * it under the terms of the GNU General Public License as published by |
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(__cmpxchg_u32); | |||
38 | #ifdef CONFIG_SMP | 38 | #ifdef CONFIG_SMP |
39 | EXPORT_SYMBOL(__atomic_hash); | 39 | EXPORT_SYMBOL(__atomic_hash); |
40 | #endif | 40 | #endif |
41 | #ifdef __LP64__ | 41 | #ifdef CONFIG_64BIT |
42 | EXPORT_SYMBOL(__xchg64); | 42 | EXPORT_SYMBOL(__xchg64); |
43 | EXPORT_SYMBOL(__cmpxchg_u64); | 43 | EXPORT_SYMBOL(__cmpxchg_u64); |
44 | #endif | 44 | #endif |
@@ -58,7 +58,7 @@ EXPORT_SYMBOL(fixup_get_user_skip_2); | |||
58 | EXPORT_SYMBOL(fixup_put_user_skip_1); | 58 | EXPORT_SYMBOL(fixup_put_user_skip_1); |
59 | EXPORT_SYMBOL(fixup_put_user_skip_2); | 59 | EXPORT_SYMBOL(fixup_put_user_skip_2); |
60 | 60 | ||
61 | #ifndef __LP64__ | 61 | #ifndef CONFIG_64BIT |
62 | /* Needed so insmod can set dp value */ | 62 | /* Needed so insmod can set dp value */ |
63 | extern int $global$; | 63 | extern int $global$; |
64 | EXPORT_SYMBOL($global$); | 64 | EXPORT_SYMBOL($global$); |
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(__muldi3); | |||
135 | asmlinkage void * __canonicalize_funcptr_for_compare(void *); | 135 | asmlinkage void * __canonicalize_funcptr_for_compare(void *); |
136 | EXPORT_SYMBOL(__canonicalize_funcptr_for_compare); | 136 | EXPORT_SYMBOL(__canonicalize_funcptr_for_compare); |
137 | 137 | ||
138 | #ifdef __LP64__ | 138 | #ifdef CONFIG_64BIT |
139 | extern void __divdi3(void); | 139 | extern void __divdi3(void); |
140 | extern void __udivdi3(void); | 140 | extern void __udivdi3(void); |
141 | extern void __umoddi3(void); | 141 | extern void __umoddi3(void); |
@@ -147,7 +147,7 @@ EXPORT_SYMBOL(__umoddi3); | |||
147 | EXPORT_SYMBOL(__moddi3); | 147 | EXPORT_SYMBOL(__moddi3); |
148 | #endif | 148 | #endif |
149 | 149 | ||
150 | #ifndef __LP64__ | 150 | #ifndef CONFIG_64BIT |
151 | extern void $$dyncall(void); | 151 | extern void $$dyncall(void); |
152 | EXPORT_SYMBOL($$dyncall); | 152 | EXPORT_SYMBOL($$dyncall); |
153 | #endif | 153 | #endif |
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index dfca014b49ba..0dd3847f494c 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c | |||
@@ -13,7 +13,7 @@ | |||
13 | * Copyright (C) 2000 Grant Grundler <grundler with parisc-linux.org> | 13 | * Copyright (C) 2000 Grant Grundler <grundler with parisc-linux.org> |
14 | * Copyright (C) 2001 Alan Modra <amodra at parisc-linux.org> | 14 | * Copyright (C) 2001 Alan Modra <amodra at parisc-linux.org> |
15 | * Copyright (C) 2001-2002 Ryan Bradetich <rbrad at parisc-linux.org> | 15 | * Copyright (C) 2001-2002 Ryan Bradetich <rbrad at parisc-linux.org> |
16 | * Copyright (C) 2001-2002 Helge Deller <deller at parisc-linux.org> | 16 | * Copyright (C) 2001-2007 Helge Deller <deller at parisc-linux.org> |
17 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> | 17 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> |
18 | * | 18 | * |
19 | * | 19 | * |
@@ -303,7 +303,7 @@ copy_thread(int nr, unsigned long clone_flags, unsigned long usp, | |||
303 | * Copy function and argument to be called from | 303 | * Copy function and argument to be called from |
304 | * ret_from_kernel_thread. | 304 | * ret_from_kernel_thread. |
305 | */ | 305 | */ |
306 | #ifdef __LP64__ | 306 | #ifdef CONFIG_64BIT |
307 | cregs->gr[27] = pregs->gr[27]; | 307 | cregs->gr[27] = pregs->gr[27]; |
308 | #endif | 308 | #endif |
309 | cregs->gr[26] = pregs->gr[26]; | 309 | cregs->gr[26] = pregs->gr[26]; |
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index b20894a01d56..7c056dcebf55 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
@@ -93,7 +93,7 @@ static int __init processor_probe(struct parisc_device *dev) | |||
93 | cpuid = boot_cpu_data.cpu_count; | 93 | cpuid = boot_cpu_data.cpu_count; |
94 | txn_addr = dev->hpa.start; /* for legacy PDC */ | 94 | txn_addr = dev->hpa.start; /* for legacy PDC */ |
95 | 95 | ||
96 | #ifdef __LP64__ | 96 | #ifdef CONFIG_64BIT |
97 | if (is_pdc_pat()) { | 97 | if (is_pdc_pat()) { |
98 | ulong status; | 98 | ulong status; |
99 | unsigned long bytecnt; | 99 | unsigned long bytecnt; |
@@ -309,11 +309,11 @@ int __init init_per_cpu(int cpunum) | |||
309 | } else { | 309 | } else { |
310 | printk(KERN_WARNING "WARNING: No FP CoProcessor?!" | 310 | printk(KERN_WARNING "WARNING: No FP CoProcessor?!" |
311 | " (coproc_cfg.ccr_functional == 0x%lx, expected 0xc0)\n" | 311 | " (coproc_cfg.ccr_functional == 0x%lx, expected 0xc0)\n" |
312 | #ifdef __LP64__ | 312 | #ifdef CONFIG_64BIT |
313 | "Halting Machine - FP required\n" | 313 | "Halting Machine - FP required\n" |
314 | #endif | 314 | #endif |
315 | , coproc_cfg.ccr_functional); | 315 | , coproc_cfg.ccr_functional); |
316 | #ifdef __LP64__ | 316 | #ifdef CONFIG_64BIT |
317 | mdelay(100); /* previous chars get pushed to console */ | 317 | mdelay(100); /* previous chars get pushed to console */ |
318 | panic("FP CoProc not reported"); | 318 | panic("FP CoProc not reported"); |
319 | #endif | 319 | #endif |
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index 3f28de974556..0d0d617b6f21 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c | |||
@@ -36,7 +36,7 @@ | |||
36 | #define DBG(x...) | 36 | #define DBG(x...) |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #ifdef __LP64__ | 39 | #ifdef CONFIG_64BIT |
40 | 40 | ||
41 | /* This function is needed to translate 32 bit pt_regs offsets in to | 41 | /* This function is needed to translate 32 bit pt_regs offsets in to |
42 | * 64 bit pt_regs offsets. For example, a 32 bit gdb under a 64 bit kernel | 42 | * 64 bit pt_regs offsets. For example, a 32 bit gdb under a 64 bit kernel |
@@ -90,7 +90,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
90 | case PTRACE_PEEKDATA: { | 90 | case PTRACE_PEEKDATA: { |
91 | int copied; | 91 | int copied; |
92 | 92 | ||
93 | #ifdef __LP64__ | 93 | #ifdef CONFIG_64BIT |
94 | if (__is_compat_task(child)) { | 94 | if (__is_compat_task(child)) { |
95 | unsigned int tmp; | 95 | unsigned int tmp; |
96 | 96 | ||
@@ -122,7 +122,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
122 | case PTRACE_POKETEXT: /* write the word at location addr. */ | 122 | case PTRACE_POKETEXT: /* write the word at location addr. */ |
123 | case PTRACE_POKEDATA: | 123 | case PTRACE_POKEDATA: |
124 | ret = 0; | 124 | ret = 0; |
125 | #ifdef __LP64__ | 125 | #ifdef CONFIG_64BIT |
126 | if (__is_compat_task(child)) { | 126 | if (__is_compat_task(child)) { |
127 | unsigned int tmp = (unsigned int)data; | 127 | unsigned int tmp = (unsigned int)data; |
128 | DBG("sys_ptrace(POKE%s, %d, %lx, %lx)\n", | 128 | DBG("sys_ptrace(POKE%s, %d, %lx, %lx)\n", |
@@ -145,7 +145,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
145 | processes, the kernel saves all regs on a syscall. */ | 145 | processes, the kernel saves all regs on a syscall. */ |
146 | case PTRACE_PEEKUSR: { | 146 | case PTRACE_PEEKUSR: { |
147 | ret = -EIO; | 147 | ret = -EIO; |
148 | #ifdef __LP64__ | 148 | #ifdef CONFIG_64BIT |
149 | if (__is_compat_task(child)) { | 149 | if (__is_compat_task(child)) { |
150 | unsigned int tmp; | 150 | unsigned int tmp; |
151 | 151 | ||
@@ -204,7 +204,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data) | |||
204 | ret = 0; | 204 | ret = 0; |
205 | goto out_tsk; | 205 | goto out_tsk; |
206 | } | 206 | } |
207 | #ifdef __LP64__ | 207 | #ifdef CONFIG_64BIT |
208 | if (__is_compat_task(child)) { | 208 | if (__is_compat_task(child)) { |
209 | if (addr & (sizeof(int)-1)) | 209 | if (addr & (sizeof(int)-1)) |
210 | goto out_tsk; | 210 | goto out_tsk; |
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index 3c7a3faf78ed..21b9fb17b409 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c | |||
@@ -120,13 +120,13 @@ extern void collect_boot_cpu_data(void); | |||
120 | 120 | ||
121 | void __init setup_arch(char **cmdline_p) | 121 | void __init setup_arch(char **cmdline_p) |
122 | { | 122 | { |
123 | #ifdef __LP64__ | 123 | #ifdef CONFIG_64BIT |
124 | extern int parisc_narrow_firmware; | 124 | extern int parisc_narrow_firmware; |
125 | #endif | 125 | #endif |
126 | 126 | ||
127 | init_per_cpu(smp_processor_id()); /* Set Modes & Enable FP */ | 127 | init_per_cpu(smp_processor_id()); /* Set Modes & Enable FP */ |
128 | 128 | ||
129 | #ifdef __LP64__ | 129 | #ifdef CONFIG_64BIT |
130 | printk(KERN_INFO "The 64-bit Kernel has started...\n"); | 130 | printk(KERN_INFO "The 64-bit Kernel has started...\n"); |
131 | #else | 131 | #else |
132 | printk(KERN_INFO "The 32-bit Kernel has started...\n"); | 132 | printk(KERN_INFO "The 32-bit Kernel has started...\n"); |
@@ -134,7 +134,7 @@ void __init setup_arch(char **cmdline_p) | |||
134 | 134 | ||
135 | pdc_console_init(); | 135 | pdc_console_init(); |
136 | 136 | ||
137 | #ifdef __LP64__ | 137 | #ifdef CONFIG_64BIT |
138 | if(parisc_narrow_firmware) { | 138 | if(parisc_narrow_firmware) { |
139 | printk(KERN_INFO "Kernel is using PDC in 32-bit mode.\n"); | 139 | printk(KERN_INFO "Kernel is using PDC in 32-bit mode.\n"); |
140 | } | 140 | } |
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index 64169ab82de2..9784e405f849 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
@@ -62,7 +62,7 @@ | |||
62 | /* | 62 | /* |
63 | * Atomically swap in the new signal mask, and wait for a signal. | 63 | * Atomically swap in the new signal mask, and wait for a signal. |
64 | */ | 64 | */ |
65 | #ifdef __LP64__ | 65 | #ifdef CONFIG_64BIT |
66 | #include "sys32.h" | 66 | #include "sys32.h" |
67 | #endif | 67 | #endif |
68 | 68 | ||
@@ -103,7 +103,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall) | |||
103 | sigset_t set; | 103 | sigset_t set; |
104 | unsigned long usp = (regs->gr[30] & ~(0x01UL)); | 104 | unsigned long usp = (regs->gr[30] & ~(0x01UL)); |
105 | unsigned long sigframe_size = PARISC_RT_SIGFRAME_SIZE; | 105 | unsigned long sigframe_size = PARISC_RT_SIGFRAME_SIZE; |
106 | #ifdef __LP64__ | 106 | #ifdef CONFIG_64BIT |
107 | compat_sigset_t compat_set; | 107 | compat_sigset_t compat_set; |
108 | struct compat_rt_sigframe __user * compat_frame; | 108 | struct compat_rt_sigframe __user * compat_frame; |
109 | 109 | ||
@@ -117,7 +117,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall) | |||
117 | (usp - sigframe_size); | 117 | (usp - sigframe_size); |
118 | DBG(2,"sys_rt_sigreturn: frame is %p\n", frame); | 118 | DBG(2,"sys_rt_sigreturn: frame is %p\n", frame); |
119 | 119 | ||
120 | #ifdef __LP64__ | 120 | #ifdef CONFIG_64BIT |
121 | compat_frame = (struct compat_rt_sigframe __user *)frame; | 121 | compat_frame = (struct compat_rt_sigframe __user *)frame; |
122 | 122 | ||
123 | if (is_compat_task()) { | 123 | if (is_compat_task()) { |
@@ -139,7 +139,7 @@ sys_rt_sigreturn(struct pt_regs *regs, int in_syscall) | |||
139 | spin_unlock_irq(¤t->sighand->siglock); | 139 | spin_unlock_irq(¤t->sighand->siglock); |
140 | 140 | ||
141 | /* Good thing we saved the old gr[30], eh? */ | 141 | /* Good thing we saved the old gr[30], eh? */ |
142 | #ifdef __LP64__ | 142 | #ifdef CONFIG_64BIT |
143 | if (is_compat_task()) { | 143 | if (is_compat_task()) { |
144 | DBG(1,"sys_rt_sigreturn: compat_frame->uc.uc_mcontext 0x%p\n", | 144 | DBG(1,"sys_rt_sigreturn: compat_frame->uc.uc_mcontext 0x%p\n", |
145 | &compat_frame->uc.uc_mcontext); | 145 | &compat_frame->uc.uc_mcontext); |
@@ -251,7 +251,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
251 | unsigned long rp, usp; | 251 | unsigned long rp, usp; |
252 | unsigned long haddr, sigframe_size; | 252 | unsigned long haddr, sigframe_size; |
253 | int err = 0; | 253 | int err = 0; |
254 | #ifdef __LP64__ | 254 | #ifdef CONFIG_64BIT |
255 | compat_int_t compat_val; | 255 | compat_int_t compat_val; |
256 | struct compat_rt_sigframe __user * compat_frame; | 256 | struct compat_rt_sigframe __user * compat_frame; |
257 | compat_sigset_t compat_set; | 257 | compat_sigset_t compat_set; |
@@ -265,7 +265,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
265 | DBG(1,"setup_rt_frame: frame %p info %p\n", frame, info); | 265 | DBG(1,"setup_rt_frame: frame %p info %p\n", frame, info); |
266 | 266 | ||
267 | 267 | ||
268 | #ifdef __LP64__ | 268 | #ifdef CONFIG_64BIT |
269 | 269 | ||
270 | compat_frame = (struct compat_rt_sigframe __user *)frame; | 270 | compat_frame = (struct compat_rt_sigframe __user *)frame; |
271 | 271 | ||
@@ -345,7 +345,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
345 | 345 | ||
346 | haddr = A(ka->sa.sa_handler); | 346 | haddr = A(ka->sa.sa_handler); |
347 | /* The sa_handler may be a pointer to a function descriptor */ | 347 | /* The sa_handler may be a pointer to a function descriptor */ |
348 | #ifdef __LP64__ | 348 | #ifdef CONFIG_64BIT |
349 | if (is_compat_task()) { | 349 | if (is_compat_task()) { |
350 | #endif | 350 | #endif |
351 | if (haddr & PA_PLABEL_FDESC) { | 351 | if (haddr & PA_PLABEL_FDESC) { |
@@ -360,7 +360,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
360 | haddr = fdesc.addr; | 360 | haddr = fdesc.addr; |
361 | regs->gr[19] = fdesc.gp; | 361 | regs->gr[19] = fdesc.gp; |
362 | } | 362 | } |
363 | #ifdef __LP64__ | 363 | #ifdef CONFIG_64BIT |
364 | } else { | 364 | } else { |
365 | Elf64_Fdesc fdesc; | 365 | Elf64_Fdesc fdesc; |
366 | Elf64_Fdesc __user *ufdesc = (Elf64_Fdesc __user *)A(haddr & ~3); | 366 | Elf64_Fdesc __user *ufdesc = (Elf64_Fdesc __user *)A(haddr & ~3); |
@@ -380,19 +380,19 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
380 | /* The syscall return path will create IAOQ values from r31. | 380 | /* The syscall return path will create IAOQ values from r31. |
381 | */ | 381 | */ |
382 | sigframe_size = PARISC_RT_SIGFRAME_SIZE; | 382 | sigframe_size = PARISC_RT_SIGFRAME_SIZE; |
383 | #ifdef __LP64__ | 383 | #ifdef CONFIG_64BIT |
384 | if (is_compat_task()) | 384 | if (is_compat_task()) |
385 | sigframe_size = PARISC_RT_SIGFRAME_SIZE32; | 385 | sigframe_size = PARISC_RT_SIGFRAME_SIZE32; |
386 | #endif | 386 | #endif |
387 | if (in_syscall) { | 387 | if (in_syscall) { |
388 | regs->gr[31] = haddr; | 388 | regs->gr[31] = haddr; |
389 | #ifdef __LP64__ | 389 | #ifdef CONFIG_64BIT |
390 | if (!test_thread_flag(TIF_32BIT)) | 390 | if (!test_thread_flag(TIF_32BIT)) |
391 | sigframe_size |= 1; | 391 | sigframe_size |= 1; |
392 | #endif | 392 | #endif |
393 | } else { | 393 | } else { |
394 | unsigned long psw = USER_PSW; | 394 | unsigned long psw = USER_PSW; |
395 | #ifdef __LP64__ | 395 | #ifdef CONFIG_64BIT |
396 | if (!test_thread_flag(TIF_32BIT)) | 396 | if (!test_thread_flag(TIF_32BIT)) |
397 | psw |= PSW_W; | 397 | psw |= PSW_W; |
398 | #endif | 398 | #endif |
@@ -417,7 +417,7 @@ setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
417 | regs->gr[2] = rp; /* userland return pointer */ | 417 | regs->gr[2] = rp; /* userland return pointer */ |
418 | regs->gr[26] = sig; /* signal number */ | 418 | regs->gr[26] = sig; /* signal number */ |
419 | 419 | ||
420 | #ifdef __LP64__ | 420 | #ifdef CONFIG_64BIT |
421 | if (is_compat_task()) { | 421 | if (is_compat_task()) { |
422 | regs->gr[25] = A(&compat_frame->info); /* siginfo pointer */ | 422 | regs->gr[25] = A(&compat_frame->info); /* siginfo pointer */ |
423 | regs->gr[24] = A(&compat_frame->uc); /* ucontext pointer */ | 423 | regs->gr[24] = A(&compat_frame->uc); /* ucontext pointer */ |
diff --git a/arch/parisc/kernel/syscall_table.S b/arch/parisc/kernel/syscall_table.S index 7f037b72ad03..7651e54ddbbb 100644 --- a/arch/parisc/kernel/syscall_table.S +++ b/arch/parisc/kernel/syscall_table.S | |||
@@ -10,7 +10,7 @@ | |||
10 | * Copyright (C) 2000 Grant Grundler <grundler at parisc-linux.org> | 10 | * Copyright (C) 2000 Grant Grundler <grundler at parisc-linux.org> |
11 | * Copyright (C) 2001 Richard Hirst <rhirst with parisc-linux.org> | 11 | * Copyright (C) 2001 Richard Hirst <rhirst with parisc-linux.org> |
12 | * Copyright (C) 2001-2002 Ryan Bradetich <rbrad at parisc-linux.org> | 12 | * Copyright (C) 2001-2002 Ryan Bradetich <rbrad at parisc-linux.org> |
13 | * Copyright (C) 2001 Helge Deller <deller at parisc-linux.org> | 13 | * Copyright (C) 2001-2007 Helge Deller <deller at parisc-linux.org> |
14 | * Copyright (C) 2000-2001 Thomas Bogendoerfer <tsbogend at parisc-linux.org> | 14 | * Copyright (C) 2000-2001 Thomas Bogendoerfer <tsbogend at parisc-linux.org> |
15 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> | 15 | * Copyright (C) 2002 Randolph Chung <tausq with parisc-linux.org> |
16 | * Copyright (C) 2005-2006 Kyle McMartin <kyle at parisc-linux.org> | 16 | * Copyright (C) 2005-2006 Kyle McMartin <kyle at parisc-linux.org> |
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 |
841 | extern const void fault_vector_11; | 841 | extern const void fault_vector_11; |
842 | #endif | 842 | #endif |
843 | extern const void fault_vector_20; | 843 | extern 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; |