Commit a8f44e38 authored by Helge Deller's avatar Helge Deller Committed by Kyle McMartin
Browse files

[PARISC] use CONFIG_64BIT instead of __LP64__ 



- additionally update my copyright timestamps

Signed-off-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarKyle McMartin <kyle@parisc-linux.org>
parent 0b3d643f

arch/parisc/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ 


#define BLANK() asm volatile("\n->" : : )



#ifdef __LP64__

#ifdef CONFIG_64BIT

#define FRAME_SIZE	128

#else

#define FRAME_SIZE	64

arch/parisc/kernel/firmware.c

+13 −13
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static DEFINE_SPINLOCK(pdc_lock); 
static unsigned long pdc_result[32] __attribute__ ((aligned (8)));

static unsigned long pdc_result2[32] __attribute__ ((aligned (8)));



#ifdef __LP64__

#ifdef CONFIG_64BIT

#define WIDE_FIRMWARE 0x1

#define NARROW_FIRMWARE 0x2
@@ -94,12 +94,12 @@ int parisc_narrow_firmware __read_mostly = 1; 
 * when running a 64-bit kernel on such boxes (e.g. C200 or C360).

 */



#ifdef __LP64__

#ifdef CONFIG_64BIT

long real64_call(unsigned long function, ...);

#endif

long real32_call(unsigned long function, ...);



#ifdef __LP64__

#ifdef CONFIG_64BIT

#   define MEM_PDC (unsigned long)(PAGE0->mem_pdc_hi) << 32 | PAGE0->mem_pdc

#   define mem_pdc_call(args...) unlikely(parisc_narrow_firmware) ? real32_call(MEM_PDC, args) : real64_call(MEM_PDC, args)

#else
@@ -117,7 +117,7 @@ long real32_call(unsigned long function, ...); 
 */

static unsigned long f_extend(unsigned long address)

{

#ifdef __LP64__

#ifdef CONFIG_64BIT

	if(unlikely(parisc_narrow_firmware)) {

		if((address & 0xff000000) == 0xf0000000)

			return 0xf0f0f0f000000000UL | (u32)address;
@@ -139,7 +139,7 @@ static unsigned long f_extend(unsigned long address) 
 */

static void convert_to_wide(unsigned long *addr)

{

#ifdef __LP64__

#ifdef CONFIG_64BIT

	int i;

	unsigned int *p = (unsigned int *)addr;
@@ -158,7 +158,7 @@ static void convert_to_wide(unsigned long *addr) 
 */

void __init set_firmware_width(void)

{

#ifdef __LP64__

#ifdef CONFIG_64BIT

	int retval;

	unsigned long flags;
@@ -238,7 +238,7 @@ int __init pdc_chassis_info(struct pdc_chassis_info *chassis_info, void *led_inf 
 * 

 * Must be correctly formatted or expect system crash

 */

#ifdef __LP64__

#ifdef CONFIG_64BIT

int pdc_pat_chassis_send_log(unsigned long state, unsigned long data)

{

	int retval = 0;
@@ -949,7 +949,7 @@ int pdc_tod_set(unsigned long sec, unsigned long usec) 
}

EXPORT_SYMBOL(pdc_tod_set);



#ifdef __LP64__

#ifdef CONFIG_64BIT

int pdc_mem_mem_table(struct pdc_memory_table_raddr *r_addr,

		struct pdc_memory_table *tbl, unsigned long entries)

{
@@ -965,7 +965,7 @@ int pdc_mem_mem_table(struct pdc_memory_table_raddr *r_addr, 


	return retval;

}

#endif /* __LP64__ */

#endif /* CONFIG_64BIT */



/* FIXME: Is this pdc used?  I could not find type reference to ftc_bitmap

 * 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, 
}

EXPORT_SYMBOL(pdc_sti_call);



#ifdef __LP64__

#ifdef CONFIG_64BIT

/**

 * pdc_pat_cell_get_number - Returns the cell number.

 * @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) 


	return retval;

}

#endif /* __LP64__ */

#endif /* CONFIG_64BIT */





/***************** 32-bit real-mode calls ***********/
@@ -1445,7 +1445,7 @@ long real32_call(unsigned long fn, ...) 
	return real32_call_asm(&real_stack.sp, &real_stack.arg0, fn);

}



#ifdef __LP64__

#ifdef CONFIG_64BIT

/***************** 64-bit real-mode calls ***********/



struct wide_stack {
@@ -1496,5 +1496,5 @@ long real64_call(unsigned long fn, ...) 
	return real64_call_asm(&real64_stack.sp, &real64_stack.arg0, fn);

}



#endif /* __LP64__ */

#endif /* CONFIG_64BIT */

arch/parisc/kernel/inventory.c

+5 −5
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void __init setup_pdc(void) 
	struct pdc_system_map_mod_info module_result;

	struct pdc_module_path module_path;

	struct pdc_model model;

#ifdef __LP64__

#ifdef CONFIG_64BIT

	struct pdc_pat_cell_num cell_info;

#endif
@@ -73,7 +73,7 @@ void __init setup_pdc(void) 
	 * clearer message.

	 */



#ifdef __LP64__

#ifdef CONFIG_64BIT

	status = pdc_pat_cell_get_number(&cell_info);

	if (status == PDC_OK) {

		pdc_type = PDC_TYPE_PAT;
@@ -152,7 +152,7 @@ static void __init pagezero_memconfig(void) 
	npmem_ranges = 1;

}



#ifdef __LP64__

#ifdef CONFIG_64BIT



/* All of the PDC PAT specific code is 64-bit only */
@@ -408,13 +408,13 @@ static void __init sprockets_memconfig(void) 
	}

}



#else   /* !__LP64__ */

#else   /* !CONFIG_64BIT */



#define pat_inventory() do { } while (0)

#define pat_memconfig() do { } while (0)

#define sprockets_memconfig() pagezero_memconfig()



#endif	/* !__LP64__ */

#endif	/* !CONFIG_64BIT */





#ifndef CONFIG_PA20

arch/parisc/kernel/module.c

+8 −8
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static inline int in_local_section(struct module *me, void *loc, void *dot) 
}





#ifndef __LP64__

#ifndef CONFIG_64BIT

struct got_entry {

	Elf32_Addr addr;

};
@@ -177,7 +177,7 @@ void *module_alloc(unsigned long size) 
	return vmalloc(size);

}



#ifndef __LP64__

#ifndef CONFIG_64BIT

static inline unsigned long count_gots(const Elf_Rela *rela, unsigned long n)

{

	return 0;
@@ -320,7 +320,7 @@ int module_frob_arch_sections(CONST Elf_Ehdr *hdr, 
	return 0;

}



#ifdef __LP64__

#ifdef CONFIG_64BIT

static Elf64_Word get_got(struct module *me, unsigned long value, long addend)

{

	unsigned int i;
@@ -343,9 +343,9 @@ static Elf64_Word get_got(struct module *me, unsigned long value, long addend) 
	       value);

	return i * sizeof(struct got_entry);

}

#endif /* __LP64__ */

#endif /* CONFIG_64BIT */



#ifdef __LP64__

#ifdef CONFIG_64BIT

static Elf_Addr get_fdesc(struct module *me, unsigned long value)

{

	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) 
	fdesc->gp = (Elf_Addr)me->module_core + me->arch.got_offset;

	return (Elf_Addr)fdesc;

}

#endif /* __LP64__ */

#endif /* CONFIG_64BIT */



enum elf_stub_type {

	ELF_STUB_GOT,
@@ -395,7 +395,7 @@ static Elf_Addr get_stub(struct module *me, unsigned long value, long addend, 
			i * sizeof(struct stub_entry);

	}



#ifndef __LP64__

#ifndef CONFIG_64BIT

/* for 32-bit the stub looks like this:

 * 	ldil L'XXX,%r1

 * 	be,n R'XXX(%sr4,%r1)
@@ -473,7 +473,7 @@ int apply_relocate(Elf_Shdr *sechdrs, 
	return -ENOEXEC;

}



#ifndef __LP64__

#ifndef CONFIG_64BIT

int apply_relocate_add(Elf_Shdr *sechdrs,

		       const char *strtab,

		       unsigned int symindex,

arch/parisc/kernel/parisc_ksyms.c

+5 −5
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
 *    Copyright (C) 2001-2003 Grant Grundler <grundler with parisc-linux.org>

 *    Copyright (C) 2002-2003 Matthew Wilcox <willy at parisc-linux.org>

 *    Copyright (C) 2002 Randolph Chung <tausq at parisc-linux.org>

 *    Copyright (C) 2002-2003 Helge Deller <deller with parisc-linux.org>

 *    Copyright (C) 2002-2007 Helge Deller <deller with parisc-linux.org>

 * 

 *    This program is free software; you can redistribute it and/or modify

 *    it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ EXPORT_SYMBOL(__cmpxchg_u32); 
#ifdef CONFIG_SMP

EXPORT_SYMBOL(__atomic_hash);

#endif

#ifdef __LP64__

#ifdef CONFIG_64BIT

EXPORT_SYMBOL(__xchg64);

EXPORT_SYMBOL(__cmpxchg_u64);

#endif
@@ -58,7 +58,7 @@ EXPORT_SYMBOL(fixup_get_user_skip_2); 
EXPORT_SYMBOL(fixup_put_user_skip_1);

EXPORT_SYMBOL(fixup_put_user_skip_2);



#ifndef __LP64__

#ifndef CONFIG_64BIT

/* Needed so insmod can set dp value */

extern int $global$;

EXPORT_SYMBOL($global$);
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(__muldi3); 
asmlinkage void * __canonicalize_funcptr_for_compare(void *);

EXPORT_SYMBOL(__canonicalize_funcptr_for_compare);



#ifdef __LP64__

#ifdef CONFIG_64BIT

extern void __divdi3(void);

extern void __udivdi3(void);

extern void __umoddi3(void);
@@ -147,7 +147,7 @@ EXPORT_SYMBOL(__umoddi3); 
EXPORT_SYMBOL(__moddi3);

#endif



#ifndef __LP64__

#ifndef CONFIG_64BIT

extern void $$dyncall(void);

EXPORT_SYMBOL($$dyncall);

#endif