diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2016-08-02 20:18:43 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2016-08-02 20:18:43 +0000 |
| commit | 073af4bda1dafb40236b9b7e2c2ba8c7fc43b9b3 (patch) | |
| tree | 88c8f79b10c58733f8cfc50848938b546bfa5c99 /usr.sbin/pmcstudy | |
| parent | a3f688bb2e5dc286bc5e61f9ba6961bf6e6e1c26 (diff) | |
| download | FreeBSD-src-073af4bda1dafb40236b9b7e2c2ba8c7fc43b9b3.zip FreeBSD-src-073af4bda1dafb40236b9b7e2c2ba8c7fc43b9b3.tar.gz | |
MFC r303410,r303419:
r303410:
Reconnect pmcstudy, lost in r291021
r303419:
Fix non-amd64 build from r292043 after reconnecting in r303410.
Approved by: re (kib)
Diffstat (limited to 'usr.sbin/pmcstudy')
| -rw-r--r-- | usr.sbin/pmcstudy/pmcstudy.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/pmcstudy/pmcstudy.c b/usr.sbin/pmcstudy/pmcstudy.c index e94addf..3cf1f8e 100644 --- a/usr.sbin/pmcstudy/pmcstudy.c +++ b/usr.sbin/pmcstudy/pmcstudy.c @@ -2322,11 +2322,7 @@ do_cpuid(u_int ax, u_int cx, u_int *p) #else #define cpuid(in, a, b, c, d) -static __inline void -do_cpuid(u_int ax, u_int cx, u_int *p) -{ -} - +#define do_cpuid(ax, cx, p) #endif static void |
