diff options
| author | Karel Zak | 2013-04-17 16:58:00 +0200 |
|---|---|---|
| committer | Karel Zak | 2013-04-17 16:58:00 +0200 |
| commit | 6d791b4cc04ee2a7cf006dee1109ae39292b3d96 (patch) | |
| tree | 77b8794ff27cc1589c0498f130f1ac08ae9ed37d | |
| parent | lscpu: set 32-bit / 64-bit for ppc (diff) | |
| download | kernel-qcow2-util-linux-6d791b4cc04ee2a7cf006dee1109ae39292b3d96.tar.gz kernel-qcow2-util-linux-6d791b4cc04ee2a7cf006dee1109ae39292b3d96.tar.xz kernel-qcow2-util-linux-6d791b4cc04ee2a7cf006dee1109ae39292b3d96.zip | |
include: fix SYS_{unshare,nsenter} usage
Signed-off-by: Karel Zak <kzak@redhat.com>
| -rw-r--r-- | include/namespace.h | 4 | ||||
| -rw-r--r-- | sys-utils/lscpu.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/namespace.h b/include/namespace.h index 9264302c6..ea231cacb 100644 --- a/include/namespace.h +++ b/include/namespace.h @@ -27,14 +27,14 @@ # include <sys/syscall.h> # endif -# ifndef HAVE_UNSHARE +# if !defined(HAVE_UNSHARE) && defined(SYS_unshare) static inline int unshare(int flags) { return syscall(SYS_unshare, flags); } # endif -# ifndef HAVE_SETNS +# if !defined(HAVE_SETNS) && defined(SYS_setns) static inline int setns(int fd, int nstype) { return syscall(SYS_setns, fd, nstype); diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index cd7be230a..2e08f66a9 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -521,7 +521,7 @@ read_hypervisor_cpuid(struct lscpu_desc *desc) #else /* ! __x86_64__ */ static void -read_hypervisor_cpuid(struct lscpu_desc *desc) +read_hypervisor_cpuid(struct lscpu_desc *desc __attribute__((__unused__))) { } #endif |