mirror of
https://github.com/torvalds/linux.git
synced 2024-12-12 14:12:51 +00:00
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>
35 lines
882 B
C
35 lines
882 B
C
/*
|
|
* delay.h: Linux delay routines on the Sparc.
|
|
*
|
|
* Copyright (C) 1994 David S. Miller (davem@caip.rutgers.edu).
|
|
*/
|
|
|
|
#ifndef __SPARC_DELAY_H
|
|
#define __SPARC_DELAY_H
|
|
|
|
#include <asm/cpudata.h>
|
|
|
|
static inline void __delay(unsigned long loops)
|
|
{
|
|
__asm__ __volatile__("cmp %0, 0\n\t"
|
|
"1: bne 1b\n\t"
|
|
"subcc %0, 1, %0\n" :
|
|
"=&r" (loops) :
|
|
"0" (loops) :
|
|
"cc");
|
|
}
|
|
|
|
/* This is too messy with inline asm on the Sparc. */
|
|
extern void __udelay(unsigned long usecs, unsigned long lpj);
|
|
extern void __ndelay(unsigned long nsecs, unsigned long lpj);
|
|
|
|
#ifdef CONFIG_SMP
|
|
#define __udelay_val cpu_data(smp_processor_id()).udelay_val
|
|
#else /* SMP */
|
|
#define __udelay_val loops_per_jiffy
|
|
#endif /* SMP */
|
|
#define udelay(__usecs) __udelay(__usecs, __udelay_val)
|
|
#define ndelay(__nsecs) __ndelay(__nsecs, __udelay_val)
|
|
|
|
#endif /* defined(__SPARC_DELAY_H) */
|