From patchwork Mon Oct 6 19:11:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 38384 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6A52E20350 for ; Mon, 6 Oct 2014 19:15:50 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id q1sf3189856lam.8 for ; Mon, 06 Oct 2014 12:15:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=KvYMEtoXsGr99bR8QH0y/P1G4O3Cw2KSnqg+K+MOQaM=; b=fA9rN5wiSo0s3v+gmIxSDEJiR1rUCdY18oJ2Ro4NXj7Vbq72Pwi/oWROijHI1DZDrR 4T5KfrcfkWqED4fxMhedvXF001Saf2x3tDZB8GN/wqUE8Kfr/pW6kzGInoFs7kXWaW/c oeTKYylhtUAr3meoJL56bmPR/mXtjU6naPVjeJPjyFrbUj1XNbXK8G5KPHSOnwGfuAph VecMtysBMDhyfnrFj904mJCMPEMMT11NSeMH/bFfvkh8uNfND+bnsGM8JKXLk5H5bqse dZEgITQqyN43xe3ZuylmGYD/aU2qoDIuqABARvIjM0SI2YUSREOo6JzsjXPeFtTGE4ue Wu9A== X-Gm-Message-State: ALoCoQlr6m3TGZd9J0m3gWL72bka25wF292MOazuaE3ie9qvihPPsWQR/ZBibPTApy1Xuu33oMKO X-Received: by 10.152.43.66 with SMTP id u2mr2059905lal.1.1412622949207; Mon, 06 Oct 2014 12:15:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.1 with SMTP id u1ls151616laj.29.gmail; Mon, 06 Oct 2014 12:15:49 -0700 (PDT) X-Received: by 10.112.146.103 with SMTP id tb7mr26429124lbb.26.1412622949067; Mon, 06 Oct 2014 12:15:49 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) by mx.google.com with ESMTPS id ax8si25411953lbc.79.2014.10.06.12.15.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 06 Oct 2014 12:15:49 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by mail-lb0-f181.google.com with SMTP id l4so4750040lbv.26 for ; Mon, 06 Oct 2014 12:15:49 -0700 (PDT) X-Received: by 10.112.5.133 with SMTP id s5mr4984423lbs.102.1412622948609; Mon, 06 Oct 2014 12:15:48 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp240145lbb; Mon, 6 Oct 2014 12:15:48 -0700 (PDT) X-Received: by 10.229.94.135 with SMTP id z7mr13781544qcm.26.1412622947301; Mon, 06 Oct 2014 12:15:47 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id 33si26974580qgi.5.2014.10.06.12.15.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 06 Oct 2014 12:15:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Received: from localhost ([::1]:53903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbDl3-0007qM-Tr for patch@linaro.org; Mon, 06 Oct 2014 15:15:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57446) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbDgy-00024n-Fk for qemu-devel@nongnu.org; Mon, 06 Oct 2014 15:11:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XbDgr-0007d4-Qc for qemu-devel@nongnu.org; Mon, 06 Oct 2014 15:11:32 -0400 Received: from [2001:4b98:dc0:45:216:3eff:fe3d:166f] (port=44328 helo=afflict.kos.to) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XbDgr-0007bG-KG for qemu-devel@nongnu.org; Mon, 06 Oct 2014 15:11:25 -0400 Received: from afflict.kos.to (afflict [92.243.29.197]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by afflict.kos.to (Postfix) with ESMTPSA id 31A6B26513; Mon, 6 Oct 2014 21:11:24 +0200 (CEST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Mon, 6 Oct 2014 22:11:22 +0300 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 2001:4b98:dc0:45:216:3eff:fe3d:166f Cc: Riku Voipio Subject: [Qemu-devel] [PULL v2 4/5] linux-user: don't include timerfd if not needed X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: riku.voipio@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Riku Voipio 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 --- 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 #include #include -#include #include #include //#include @@ -67,6 +66,9 @@ int __clone2(int (*fn)(void *), void *child_stack_base, #include #include #include "qemu-common.h" +#ifdef CONFIG_TIMERFD +#include +#endif #ifdef TARGET_GPROF #include #endif