From: riku.voipio@linaro.org
To: qemu-devel@nongnu.org
Cc: Riku Voipio <riku.voipio@linaro.org>
Subject: [Qemu-devel] [PULL v2 4/5] linux-user: don't include timerfd if not needed
Date: Mon, 6 Oct 2014 22:11:22 +0300 [thread overview]
Message-ID: <d80a1905942afecafc04dba4bf51103cd30d37a1.1412622515.git.riku.voipio@linaro.org> (raw)
In-Reply-To: <cover.1412622515.git.riku.voipio@linaro.org>
From: Riku Voipio <riku.voipio@linaro.org>
Without this, builds on older systems fail with:
qemu/linux-user/syscall.c:61:25: warning: sys/timerfd.h: No such file or directory
v2: fix the usual case where CONFIG_TIMERFD is enabled..
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
linux-user/syscall.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 7087a56..a175cc1 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -58,7 +58,6 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include <sys/shm.h>
#include <sys/sem.h>
#include <sys/statfs.h>
-#include <sys/timerfd.h>
#include <utime.h>
#include <sys/sysinfo.h>
//#include <sys/user.h>
@@ -67,6 +66,9 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
#include <linux/wireless.h>
#include <linux/icmp.h>
#include "qemu-common.h"
+#ifdef CONFIG_TIMERFD
+#include <sys/timerfd.h>
+#endif
#ifdef TARGET_GPROF
#include <sys/gmon.h>
#endif
--
2.0.1
next prev parent reply other threads:[~2014-10-06 19:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-06 19:11 [Qemu-devel] [PULL v2 0/5] linux-user patches for 2.2 riku.voipio
2014-10-06 19:11 ` [Qemu-devel] [PULL v2 1/5] linux-user: Enable epoll_pwait syscall for ARM riku.voipio
2014-10-06 19:11 ` [Qemu-devel] [PULL v2 2/5] linux-user: Convert blkpg to use a special subop handler riku.voipio
2014-10-06 19:11 ` [Qemu-devel] [PULL v2 3/5] linux-user: Simplify timerid checks on g_posix_timers range riku.voipio
2014-10-06 19:11 ` riku.voipio [this message]
2014-10-06 19:11 ` [Qemu-devel] [PULL v2 5/5] translate-all.c: memory walker initial address miscalculation riku.voipio
2014-10-07 18:12 ` [Qemu-devel] [PULL v2 0/5] linux-user patches for 2.2 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d80a1905942afecafc04dba4bf51103cd30d37a1.1412622515.git.riku.voipio@linaro.org \
--to=riku.voipio@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).