| Message ID | 1431976521-30352-16-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | Accepted |
| Commit | d82322e175d58c0c8951cbc905da1ca9ee2e008c |
| Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBBBPY5CVAKGQEIFDC6VQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 705B621411 for <linaro@patches.linaro.org>; Mon, 18 May 2015 19:22:46 +0000 (UTC) Received: by wizk4 with SMTP id k4sf26769716wiz.2 for <linaro@patches.linaro.org>; Mon, 18 May 2015 12:22:45 -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: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=k/5+gLVTt0JuVPbHD1iWEmI9qoRWyqxsAp4MT07hIT8=; b=Mq0LI97QyvsOnm4r+iXk23iDb0off3M+HYEOV5/A3+OZXlmYuzXccJt25rBv/Z0Ua/ G20be4smv4WPVT4tzaONfPSm2ynZQyQ485OXgD7wHRp/W6ddwehvn7mJd8mqW24rgyaz Cf5snICb0+hpajP8nH4al9rKbuAEe7CBGH5OkxiCGg2sZxL847rUm0+lLYPodilox/0x 9RDjWalm6jhSS/RjROemaRF9yqWC7v/YLnDO44yjKkd/Nq5bHrEvzQF7OLUbjA0qvqmw 0DyirmePIv44AKzJyAJCjy1eLeEXTfg2bRHBSw9VgQQ9zdgk2ISTPewsyVrN3qTEUSIS fo3Q== X-Gm-Message-State: ALoCoQkDvrKIjWXuG11Yd2G606LILOl85kPDQZ0yChvlPJow678JnyjXHTdAzAmN9xPlhmRnVqgM X-Received: by 10.180.7.138 with SMTP id j10mr10947483wia.2.1431976965804; Mon, 18 May 2015 12:22:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.103 with SMTP id kx7ls816886lac.62.gmail; Mon, 18 May 2015 12:22:45 -0700 (PDT) X-Received: by 10.112.130.129 with SMTP id oe1mr9579371lbb.37.1431976965639; Mon, 18 May 2015 12:22:45 -0700 (PDT) Received: from mail-la0-f54.google.com (mail-la0-f54.google.com. [209.85.215.54]) by mx.google.com with ESMTPS id eq9si7271911lac.131.2015.05.18.12.22.45 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 May 2015 12:22:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.54 as permitted sender) client-ip=209.85.215.54; Received: by laat2 with SMTP id t2so234130523laa.1 for <patchwork-forward@linaro.org>; Mon, 18 May 2015 12:22:45 -0700 (PDT) X-Received: by 10.112.161.226 with SMTP id xv2mr18917207lbb.106.1431976965516; Mon, 18 May 2015 12:22:45 -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.108.230 with SMTP id hn6csp283586lbb; Mon, 18 May 2015 12:22:44 -0700 (PDT) X-Received: by 10.140.217.8 with SMTP id n8mr24549385qhb.7.1431976963837; Mon, 18 May 2015 12:22:43 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i85si8713949qhc.87.2015.05.18.12.22.43 for <patch@linaro.org> (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 18 May 2015 12:22:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:42692 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1YuQcc-00056Z-Gx for patch@linaro.org; Mon, 18 May 2015 15:22:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1YuQVi-0001Yw-I4 for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1YuQVh-00006b-0p for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:34 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34173) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1YuQVg-0008QT-FT for qemu-devel@nongnu.org; Mon, 18 May 2015 15:15:32 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from <pm215@archaic.org.uk>) id 1YuQVV-0007vD-Vu for qemu-devel@nongnu.org; Mon, 18 May 2015 20:15:21 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Mon, 18 May 2015 20:15:15 +0100 Message-Id: <1431976521-30352-16-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1431976521-30352-1-git-send-email-peter.maydell@linaro.org> References: <1431976521-30352-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 15/21] linux-user/arm: Correct TARGET_NR_timerfd to TARGET_NR_timerfd_create X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=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: peter.maydell@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.215.54 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 |
diff --git a/linux-user/arm/syscall_nr.h b/linux-user/arm/syscall_nr.h index 7d7be7c..53552be 100644 --- a/linux-user/arm/syscall_nr.h +++ b/linux-user/arm/syscall_nr.h @@ -354,7 +354,7 @@ #define TARGET_NR_kexec_load (347) #define TARGET_NR_utimensat (348) #define TARGET_NR_signalfd (349) -#define TARGET_NR_timerfd (350) +#define TARGET_NR_timerfd_create (350) #define TARGET_NR_eventfd (351) #define TARGET_NR_fallocate (352) #define TARGET_NR_timerfd_settime (353)