diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2011-05-15 21:34:10 +0100 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2011-05-15 21:34:10 +0100 |
| commit | 6b7143d774683daf27dfb2e93ab48d1ade1a3477 (patch) | |
| tree | fd02f5632a9d915059daa631435065339fb064db /usr/src/uts/intel/asm/clock.h | |
| parent | 9b7d742f0ee8ff89c05a8b5275d11359920ec60f (diff) | |
| download | illumos-joyent-6b7143d774683daf27dfb2e93ab48d1ade1a3477.tar.gz | |
2251 kernel inlines should support gcc 4
Reviewed by: Andrew Stormont <Andrew.Stormont@nexenta.com>
Reviewed by: Milan Jurik <milan.jurik@xylab.cz>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Gordon Ross <gwr@nexenta.com>
Approved by: Garrett D'Amore <garrett@damore.org>
Diffstat (limited to 'usr/src/uts/intel/asm/clock.h')
| -rw-r--r-- | usr/src/uts/intel/asm/clock.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/usr/src/uts/intel/asm/clock.h b/usr/src/uts/intel/asm/clock.h index 18adcf9f4d..26e33d0bb5 100644 --- a/usr/src/uts/intel/asm/clock.h +++ b/usr/src/uts/intel/asm/clock.h @@ -26,8 +26,7 @@ #ifndef _ASM_CLOCK_H #define _ASM_CLOCK_H -#pragma ident "%Z%%M% %I% %E% SMI" - +#include <sys/ccompile.h> #include <sys/types.h> #include <sys/time.h> @@ -39,7 +38,8 @@ extern "C" { #include <sys/machlock.h> -extern __inline__ void unlock_hres_lock(void) +extern __GNU_INLINE void +unlock_hres_lock(void) { __asm__ __volatile__( "lock; incl %0" @@ -50,7 +50,8 @@ extern __inline__ void unlock_hres_lock(void) #if defined(__xpv) -extern __inline__ hrtime_t __rdtsc_insn(void) +extern __GNU_INLINE hrtime_t +__rdtsc_insn(void) { #if defined(__amd64) uint32_t lobits, hibits; |