compel: Split cpu.h heander into uapi and priv parts

https://travis-ci.org/xemul/criu/builds/177585567Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>

compel/arch/aarch64/src/lib/cpu.c

 #include <string.h>
 #include <stdbool.h>
 
-#include "uapi/compel/cpu.h"
+#include "compel-cpu.h"
 
 #include "common/bitops.h"
 

compel/arch/arm/src/lib/cpu.c

 #include <string.h>
 #include <stdbool.h>
 
-#include "uapi/compel/cpu.h"
+#include "compel-cpu.h"
 
 #include "common/bitops.h"
 

compel/arch/ppc64/src/lib/cpu.c

@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <stdbool.h>
 
-#include "uapi/compel/cpu.h"
+#include "compel-cpu.h"
 
 #include "common/bitops.h"
 

compel/arch/x86/src/lib/cpu.c

 #include <string.h>
 #include <stdbool.h>
 
-#include "uapi/compel/cpu.h"
-
+#include "compel-cpu.h"
 #include "common/bitops.h"
 #include "common/compiler.h"
 

compel/arch/x86/src/lib/include/cpu.h

+#ifndef __COMPEL_ASM_CPU_H__
+#define __COMPEL_ASM_CPU_H__
+
+static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
+				unsigned int *ecx, unsigned int *edx)
+{
+	/* ecx is often an input as well as an output. */
+	asm volatile("cpuid"
+	    : "=a" (*eax),
+	      "=b" (*ebx),
+	      "=c" (*ecx),
+	      "=d" (*edx)
+	    : "0" (*eax), "2" (*ecx)
+	    : "memory");
+}
+
+static inline void cpuid(unsigned int op,
+			 unsigned int *eax, unsigned int *ebx,
+			 unsigned int *ecx, unsigned int *edx)
+{
+	*eax = op;
+	*ecx = 0;
+	native_cpuid(eax, ebx, ecx, edx);
+}
+
+static inline void cpuid_count(unsigned int op, int count,
+			       unsigned int *eax, unsigned int *ebx,
+			       unsigned int *ecx, unsigned int *edx)
+{
+	*eax = op;
+	*ecx = count;
+	native_cpuid(eax, ebx, ecx, edx);
+}
+
+static inline unsigned int cpuid_eax(unsigned int op)
+{
+	unsigned int eax, ebx, ecx, edx;
+
+	cpuid(op, &eax, &ebx, &ecx, &edx);
+	return eax;
+}
+
+static inline unsigned int cpuid_ecx(unsigned int op)
+{
+	unsigned int eax, ebx, ecx, edx;
+
+	cpuid(op, &eax, &ebx, &ecx, &edx);
+	return ecx;
+}
+
+static inline unsigned int cpuid_edx(unsigned int op)
+{
+	unsigned int eax, ebx, ecx, edx;
+
+	cpuid(op, &eax, &ebx, &ecx, &edx);
+	return edx;
+}
+
+#endif

compel/arch/x86/src/lib/include/uapi/asm/cpu.h

@@ -121,61 +121,6 @@
  */
 #define X86_FEATURE_PREFETCHWT1		(11*32+0) /* The PREFETCHWT1 instruction */
 
-static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,
-				unsigned int *ecx, unsigned int *edx)
-{
-	/* ecx is often an input as well as an output. */
-	asm volatile("cpuid"
-	    : "=a" (*eax),
-	      "=b" (*ebx),
-	      "=c" (*ecx),
-	      "=d" (*edx)
-	    : "0" (*eax), "2" (*ecx)
-	    : "memory");
-}
-
-static inline void cpuid(unsigned int op,
-			 unsigned int *eax, unsigned int *ebx,
-			 unsigned int *ecx, unsigned int *edx)
-{
-	*eax = op;
-	*ecx = 0;
-	native_cpuid(eax, ebx, ecx, edx);
-}
-
-static inline void cpuid_count(unsigned int op, int count,
-			       unsigned int *eax, unsigned int *ebx,
-			       unsigned int *ecx, unsigned int *edx)
-{
-	*eax = op;
-	*ecx = count;
-	native_cpuid(eax, ebx, ecx, edx);
-}
-
-static inline unsigned int cpuid_eax(unsigned int op)
-{
-	unsigned int eax, ebx, ecx, edx;
-
-	cpuid(op, &eax, &ebx, &ecx, &edx);
-	return eax;
-}
-
-static inline unsigned int cpuid_ecx(unsigned int op)
-{
-	unsigned int eax, ebx, ecx, edx;
-
-	cpuid(op, &eax, &ebx, &ecx, &edx);
-	return ecx;
-}
-
-static inline unsigned int cpuid_edx(unsigned int op)
-{
-	unsigned int eax, ebx, ecx, edx;
-
-	cpuid(op, &eax, &ebx, &ecx, &edx);
-	return edx;
-}
-
 enum {
 	X86_VENDOR_INTEL	= 0,
 	X86_VENDOR_AMD		= 1,

compel/include/compel-cpu.h

+#ifndef __COMPEL_CPU_H__
+#define __COMPEL_CPU_H__
+
+#include <compel/cpu.h>
+#include "asm/cpu.h"
+
+extern void compel_set_cpu_cap(compel_cpuinfo_t *info, unsigned int feature);
+extern void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature);
+extern int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature);
+
+#endif

compel/include/uapi/cpu.h

@@ -5,9 +5,6 @@
 
 #include <compel/asm/cpu.h>
 
-extern void compel_set_cpu_cap(compel_cpuinfo_t *info, unsigned int feature);
-extern void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature);
-extern int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature);
 extern int compel_cpuid(compel_cpuinfo_t *info);
 extern bool cpu_has_feature(unsigned int feature);