[src/trunk]: src/sys/arch/x86/include Undo previous, fixed in userland.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0414d697ac8a
branches:  trunk
changeset: 451245:0414d697ac8a
user:      christos <christos%NetBSD.org@localhost>
date:      Sat May 11 13:40:26 2019 +0000

description:
Undo previous, fixed in userland.

diffstat:

 sys/arch/x86/include/Makefile  |   3 +--
 sys/arch/x86/include/cpufunc.h |  15 ++++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diffs (58 lines):

diff -r 615f4ba6d802 -r 0414d697ac8a sys/arch/x86/include/Makefile
--- a/sys/arch/x86/include/Makefile     Sat May 11 13:04:40 2019 +0000
+++ b/sys/arch/x86/include/Makefile     Sat May 11 13:40:26 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.23 2019/05/11 12:58:17 christos Exp $
+#      $NetBSD: Makefile,v 1.24 2019/05/11 13:40:26 christos Exp $
 
 INCSDIR=/usr/include/x86
 
@@ -9,7 +9,6 @@
        cpu_extended_state.h \
        cpu_rng.h \
        cpu_ucode.h \
-       cpufunc.h \
        cputypes.h \
        cpuvar.h \
        float.h \
diff -r 615f4ba6d802 -r 0414d697ac8a sys/arch/x86/include/cpufunc.h
--- a/sys/arch/x86/include/cpufunc.h    Sat May 11 13:04:40 2019 +0000
+++ b/sys/arch/x86/include/cpufunc.h    Sat May 11 13:40:26 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpufunc.h,v 1.29 2019/05/11 12:58:17 christos Exp $    */
+/*     $NetBSD: cpufunc.h,v 1.30 2019/05/11 13:40:26 christos Exp $    */
 
 /*
  * Copyright (c) 1998, 2007, 2019 The NetBSD Foundation, Inc.
@@ -329,12 +329,6 @@
  */
 #define        OPTERON_MSR_PASSCODE    0x9c5a203aU
 
-uint64_t       rdmsr_locked(u_int);
-int            rdmsr_safe(u_int, uint64_t *);
-void           wrmsr_locked(u_int, uint64_t);
-
-#endif /* _KERNEL */
-
 static inline uint64_t
 rdmsr(u_int msr)
 {
@@ -349,6 +343,9 @@
        return (low | ((uint64_t)high << 32));
 }
 
+uint64_t       rdmsr_locked(u_int);
+int            rdmsr_safe(u_int, uint64_t *);
+
 static inline void
 wrmsr(u_int msr, uint64_t val)
 {
@@ -363,4 +360,8 @@
        );
 }
 
+void           wrmsr_locked(u_int, uint64_t);
+
+#endif /* _KERNEL */
+
 #endif /* !_X86_CPUFUNC_H_ */