diff options
author | Helge Deller <deller@gmx.de> | 2007-01-28 08:58:52 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@athena.road.mcmartin.ca> | 2007-02-17 01:16:40 -0500 |
commit | a8f44e3889b686813926b288bd4e51a0cf17d2c7 (patch) | |
tree | f6c4078aecbe33274bf1c1cff4c9e18a8ed90eaf /arch/parisc/kernel/module.c | |
parent | 0b3d643f9ead9b5141dedbb2d1b06ce15469fc4a (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/module.c')
-rw-r--r-- | arch/parisc/kernel/module.c | 16 |
1 files changed, 8 insertions, 8 deletions
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, |