Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1ea0546 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Thomas Gleixner
Browse files

x86: unify include/asm/delay_32/64.h 



Same file, except for whitespace, comment formatting and the extra
function prototype usc_tsc_delay() in _32.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 9bfa23df

include/asm-x86/delay.h

+31 −5
Original line number Diff line number Diff line 
#ifdef CONFIG_X86_32

# include "delay_32.h"

#else

# include "delay_64.h"

#endif
 
#ifndef _ASM_X86_DELAY_H

#define _ASM_X86_DELAY_H



/*

 * Copyright (C) 1993 Linus Torvalds

 *

 * Delay routines calling functions in arch/x86/lib/delay.c

 */



/* Undefined functions to get compile-time errors */

extern void __bad_udelay(void);

extern void __bad_ndelay(void);



extern void __udelay(unsigned long usecs);

extern void __ndelay(unsigned long nsecs);

extern void __const_udelay(unsigned long usecs);

extern void __delay(unsigned long loops);



/* 0x10c7 is 2**32 / 1000000 (rounded up) */

#define udelay(n) (__builtin_constant_p(n) ? \

	((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \

	__udelay(n))



/* 0x5 is 2**32 / 1000000000 (rounded up) */

#define ndelay(n) (__builtin_constant_p(n) ? \

	((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \

	__ndelay(n))



void use_tsc_delay(void);



#endif /* _ASM_X86_DELAY_H */

include/asm-x86/delay_32.h

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
#ifndef _I386_DELAY_H

#define _I386_DELAY_H



/*

 * Copyright (C) 1993 Linus Torvalds

 *

 * Delay routines calling functions in arch/i386/lib/delay.c

 */

 

/* Undefined functions to get compile-time errors */

extern void __bad_udelay(void);

extern void __bad_ndelay(void);



extern void __udelay(unsigned long usecs);

extern void __ndelay(unsigned long nsecs);

extern void __const_udelay(unsigned long usecs);

extern void __delay(unsigned long loops);



/* 0x10c7 is 2**32 / 1000000 (rounded up) */

#define udelay(n) (__builtin_constant_p(n) ? \

	((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \

	__udelay(n))



/* 0x5 is 2**32 / 1000000000 (rounded up) */

#define ndelay(n) (__builtin_constant_p(n) ? \

	((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \

	__ndelay(n))



void use_tsc_delay(void);



#endif /* defined(_I386_DELAY_H) */

include/asm-x86/delay_64.h

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
#ifndef _X8664_DELAY_H

#define _X8664_DELAY_H



/*

 * Copyright (C) 1993 Linus Torvalds

 *

 * Delay routines calling functions in arch/x86_64/lib/delay.c

 */

 

/* Undefined functions to get compile-time errors */

extern void __bad_udelay(void);

extern void __bad_ndelay(void);



extern void __udelay(unsigned long usecs);

extern void __ndelay(unsigned long nsecs);

extern void __const_udelay(unsigned long usecs);

extern void __delay(unsigned long loops);



/* 0x10c7 is 2**32 / 1000000 (rounded up) */

#define udelay(n) (__builtin_constant_p(n) ? \

	((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c7ul)) : \

	__udelay(n))



/* 0x5 is 2**32 / 1000000000 (rounded up) */

#define ndelay(n) (__builtin_constant_p(n) ? \

       ((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \

       __ndelay(n))





#endif /* defined(_X8664_DELAY_H) */