diff options
| -rw-r--r-- | sys/amd64/amd64/identcpu.c | 11 | ||||
| -rw-r--r-- | sys/amd64/include/cpufunc.h | 11 | ||||
| -rw-r--r-- | sys/i386/i386/identcpu.c | 11 | ||||
| -rw-r--r-- | sys/i386/include/cpufunc.h | 11 |
4 files changed, 22 insertions, 22 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c index cb25d285549b..b47c5ad0421b 100644 --- a/sys/amd64/amd64/identcpu.c +++ b/sys/amd64/amd64/identcpu.c @@ -80,7 +80,6 @@ static void print_AMD_info(u_int amd_maxregs); static void print_AMD_assoc(int i); static void print_transmeta_info(void); static void setup_tmx86_longrun(void); -static void do_cpuid(u_int ax, u_int *p); u_int cyrix_did; /* Device ID of Cyrix CPU */ int cpu_class = CPUCLASS_386; /* least common denominator */ @@ -112,16 +111,6 @@ static struct cpu_nameclass i386_cpus[] = { { "Pentium 4", CPUCLASS_686 }, /* CPU_P4 */ }; -static void -do_cpuid(u_int ax, u_int *p) -{ - __asm __volatile( - "cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax) - ); -} - #if defined(I586_CPU) && !defined(NO_F00F_HACK) int has_f00f_bug = 0; #endif diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index c80c9f2e39c7..969541f03d55 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -365,6 +365,16 @@ read_eflags(void) return (ef); } +static __inline void +do_cpuid(u_int ax, u_int *p) +{ + __asm __volatile( + "cpuid" + : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax) + ); +} + static __inline u_int64_t rdmsr(u_int msr) { @@ -572,6 +582,7 @@ int breakpoint __P((void)); u_int bsfl __P((u_int mask)); u_int bsrl __P((u_int mask)); void disable_intr __P((void)); +void do_cpuid __P((u_int ax, u_int *p)); void enable_intr __P((void)); u_char inb __P((u_int port)); u_int inl __P((u_int port)); diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c index cb25d285549b..b47c5ad0421b 100644 --- a/sys/i386/i386/identcpu.c +++ b/sys/i386/i386/identcpu.c @@ -80,7 +80,6 @@ static void print_AMD_info(u_int amd_maxregs); static void print_AMD_assoc(int i); static void print_transmeta_info(void); static void setup_tmx86_longrun(void); -static void do_cpuid(u_int ax, u_int *p); u_int cyrix_did; /* Device ID of Cyrix CPU */ int cpu_class = CPUCLASS_386; /* least common denominator */ @@ -112,16 +111,6 @@ static struct cpu_nameclass i386_cpus[] = { { "Pentium 4", CPUCLASS_686 }, /* CPU_P4 */ }; -static void -do_cpuid(u_int ax, u_int *p) -{ - __asm __volatile( - "cpuid" - : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) - : "0" (ax) - ); -} - #if defined(I586_CPU) && !defined(NO_F00F_HACK) int has_f00f_bug = 0; #endif diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index c80c9f2e39c7..969541f03d55 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -365,6 +365,16 @@ read_eflags(void) return (ef); } +static __inline void +do_cpuid(u_int ax, u_int *p) +{ + __asm __volatile( + "cpuid" + : "=a" (p[0]), "=b" (p[1]), "=c" (p[2]), "=d" (p[3]) + : "0" (ax) + ); +} + static __inline u_int64_t rdmsr(u_int msr) { @@ -572,6 +582,7 @@ int breakpoint __P((void)); u_int bsfl __P((u_int mask)); u_int bsrl __P((u_int mask)); void disable_intr __P((void)); +void do_cpuid __P((u_int ax, u_int *p)); void enable_intr __P((void)); u_char inb __P((u_int port)); u_int inl __P((u_int port)); |