The majority of this patch was created by the following script: *** ASM=arch/sparc/include/asm mkdir -p $ASM git mv include/asm-sparc64/ftrace.h $ASM git rm include/asm-sparc64/* git mv include/asm-sparc/* $ASM sed -ie 's/asm-sparc64/asm/g' $ASM/* sed -ie 's/asm-sparc/asm/g' $ASM/* *** The rest was an update of the top-level Makefile to use sparc for header files when sparc64 is being build. And a small fixlet to pick up the correct unistd.h from sparc64 code. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
		
			
				
	
	
		
			34 lines
		
	
	
	
		
			882 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			34 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) */
 |