f5e706ad88
With this commit all sparc64 header files are moved to asm-sparc.
The remaining files (71 files) were too different to be trivially
merged so divide them up in a _32.h and a _64.h file which
are both included from the file with no bit size.
The following script were used:
cd include
FILES=`wc -l asm-sparc64/*h | grep -v '^ 1' | cut -b 20-`
for FILE in ${FILES}; do
echo $FILE:
BASE=`echo $FILE | cut -d '.' -f 1`
FN32=${BASE}_32.h
FN64=${BASE}_64.h
GUARD=___ASM_SPARC_`echo $BASE | tr '-' '_' | tr [:lower:] [:upper:]`_H
git mv asm-sparc/$FILE asm-sparc/$FN32
git mv asm-sparc64/$FILE asm-sparc/$FN64
echo git mv done
printf "#ifndef %s\n" $GUARD > asm-sparc/$FILE
printf "#define %s\n" $GUARD >> asm-sparc/$FILE
printf "#if defined(__sparc__) && defined(__arch64__)\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN64 >> asm-sparc/$FILE
printf "#else\n" >> asm-sparc/$FILE
printf "#include <asm-sparc/%s>\n" $FN32 >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
printf "#endif\n" >> asm-sparc/$FILE
git add asm-sparc/$FILE
echo new file done
printf "#include <asm-sparc/%s>\n" $FILE > asm-sparc64/$FILE
git add asm-sparc64/$FILE
echo sparc64 file done
done
The guard contains three '_' to avoid conflict with existing guards.
In additing the two Kbuild files are emptied to avoid breaking
headers_* targets.
We will reintroduce the exported header files when the necessary
kbuild changes are merged.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
29 lines
647 B
C
29 lines
647 B
C
#ifndef __ARCH_SPARC64_PERCPU__
|
|
#define __ARCH_SPARC64_PERCPU__
|
|
|
|
#include <linux/compiler.h>
|
|
|
|
register unsigned long __local_per_cpu_offset asm("g5");
|
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
extern void real_setup_per_cpu_areas(void);
|
|
|
|
extern unsigned long __per_cpu_base;
|
|
extern unsigned long __per_cpu_shift;
|
|
#define __per_cpu_offset(__cpu) \
|
|
(__per_cpu_base + ((unsigned long)(__cpu) << __per_cpu_shift))
|
|
#define per_cpu_offset(x) (__per_cpu_offset(x))
|
|
|
|
#define __my_cpu_offset __local_per_cpu_offset
|
|
|
|
#else /* ! SMP */
|
|
|
|
#define real_setup_per_cpu_areas() do { } while (0)
|
|
|
|
#endif /* SMP */
|
|
|
|
#include <asm-generic/percpu.h>
|
|
|
|
#endif /* __ARCH_SPARC64_PERCPU__ */
|