diff options
| author | Kir Kolyshkin <kir@openvz.org> | 2017-02-08 17:36:11 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@virtuozzo.com> | 2017-03-15 09:36:05 +0300 |
| commit | c18aa3e7fb8d4c7d76120b1a4b246581902552fb (patch) | |
| tree | cee0e87d09dbc23c410ba0c2c6e187296e30e9ee /compel | |
| parent | adaa7979be6feabbd356d11fafba4766a225a4fc (diff) | |
compel: add compel_ prefix to cpu_has_feature
travis-ci: success for compel uapi cleanups
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'compel')
| -rw-r--r-- | compel/arch/aarch64/src/lib/cpu.c | 2 | ||||
| -rw-r--r-- | compel/arch/arm/src/lib/cpu.c | 2 | ||||
| -rw-r--r-- | compel/arch/ppc64/src/lib/cpu.c | 2 | ||||
| -rw-r--r-- | compel/arch/x86/src/lib/cpu.c | 2 | ||||
| -rw-r--r-- | compel/arch/x86/src/lib/infect.c | 4 | ||||
| -rw-r--r-- | compel/include/uapi/cpu.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/compel/arch/aarch64/src/lib/cpu.c b/compel/arch/aarch64/src/lib/cpu.c index 3fa544639..30263b377 100644 --- a/compel/arch/aarch64/src/lib/cpu.c +++ b/compel/arch/aarch64/src/lib/cpu.c @@ -18,7 +18,7 @@ void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { } int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { return 0; } int compel_cpuid(compel_cpuinfo_t *info) { return 0; } -bool cpu_has_feature(unsigned int feature) +bool compel_cpu_has_feature(unsigned int feature) { if (!rt_info_done) { compel_cpuid(&rt_info); diff --git a/compel/arch/arm/src/lib/cpu.c b/compel/arch/arm/src/lib/cpu.c index 3fa544639..30263b377 100644 --- a/compel/arch/arm/src/lib/cpu.c +++ b/compel/arch/arm/src/lib/cpu.c @@ -18,7 +18,7 @@ void compel_clear_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { } int compel_test_cpu_cap(compel_cpuinfo_t *info, unsigned int feature) { return 0; } int compel_cpuid(compel_cpuinfo_t *info) { return 0; } -bool cpu_has_feature(unsigned int feature) +bool compel_cpu_has_feature(unsigned int feature) { if (!rt_info_done) { compel_cpuid(&rt_info); diff --git a/compel/arch/ppc64/src/lib/cpu.c b/compel/arch/ppc64/src/lib/cpu.c index 00a02ea2a..d2a7552a1 100644 --- a/compel/arch/ppc64/src/lib/cpu.c +++ b/compel/arch/ppc64/src/lib/cpu.c @@ -32,7 +32,7 @@ int compel_cpuid(compel_cpuinfo_t *info) return 0; } -bool cpu_has_feature(unsigned int feature) +bool compel_cpu_has_feature(unsigned int feature) { if (!rt_info_done) { compel_cpuid(&rt_info); diff --git a/compel/arch/x86/src/lib/cpu.c b/compel/arch/x86/src/lib/cpu.c index 88df9f200..dbd3136f0 100644 --- a/compel/arch/x86/src/lib/cpu.c +++ b/compel/arch/x86/src/lib/cpu.c @@ -178,7 +178,7 @@ int compel_cpuid(compel_cpuinfo_t *c) return 0; } -bool cpu_has_feature(unsigned int feature) +bool compel_cpu_has_feature(unsigned int feature) { if (!rt_info_done) { compel_cpuid(&rt_info); diff --git a/compel/arch/x86/src/lib/infect.c b/compel/arch/x86/src/lib/infect.c index 2c6b6e191..53f29cfbf 100644 --- a/compel/arch/x86/src/lib/infect.c +++ b/compel/arch/x86/src/lib/infect.c @@ -157,7 +157,7 @@ int get_task_regs(pid_t pid, user_regs_struct_t regs, save_regs_t save, void *ar } } - if (!cpu_has_feature(X86_FEATURE_FPU)) + if (!compel_cpu_has_feature(X86_FEATURE_FPU)) goto out; /* @@ -167,7 +167,7 @@ int get_task_regs(pid_t pid, user_regs_struct_t regs, save_regs_t save, void *ar pr_info("Dumping GP/FPU registers for %d\n", pid); - if (cpu_has_feature(X86_FEATURE_OSXSAVE)) { + if (compel_cpu_has_feature(X86_FEATURE_OSXSAVE)) { iov.iov_base = &xsave; iov.iov_len = sizeof(xsave); diff --git a/compel/include/uapi/cpu.h b/compel/include/uapi/cpu.h index 23438da4d..4268b6c4f 100644 --- a/compel/include/uapi/cpu.h +++ b/compel/include/uapi/cpu.h @@ -6,6 +6,6 @@ #include <compel/asm/cpu.h> extern int compel_cpuid(compel_cpuinfo_t *info); -extern bool cpu_has_feature(unsigned int feature); +extern bool compel_cpu_has_feature(unsigned int feature); #endif /* UAPI_COMPEL_CPU_H__ */ |