From patchwork Thu Apr 30 09:24:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47776 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 764FE20553 for ; Thu, 30 Apr 2015 09:25:21 +0000 (UTC) Received: by lbos2 with SMTP id s2sf12900709lbo.2 for ; Thu, 30 Apr 2015 02:25:20 -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:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=tUIVnqj5gnrdevWzfiM8rjXGTMSnwCYq2waOaIGP7tk=; b=eNmZHWGyqzRFFaLJFPgohk7/MKMtHv3gaQ+WS7fDUfk4Zijv3U9NR4ZyEyCW+rJ01M 4IZtZN8E9t3s6eyetlIxv8TwLJARlJ5f5mnJFo7a/YX+bgs15ILu0jzIW3xRdizJHDPd mGJVuFFESrbAleRLBAdjp3nfcS3mshaGY1+4uMDep2PFfYvt9Q03uyZhaNpi26OXzrzq HGKALtxHB5YuKDSEibsLPa7zDmIXerf3BqawTse0egOjWho6TrqGmCncquv5EBWqUr7z pOH7facK1WgekFaujCYHPZ/dRtVFzMeu8i+4AZkbCcOjCOg1DhZo2KNJedWBNUn2e0KS blMQ== X-Gm-Message-State: ALoCoQnVxwY0hwRfb+t+62HPrGiK1nKIeoytd5LfZ6YMh+TGIqh96YOzLOP8z2hGukFAUTNFLpfa X-Received: by 10.180.98.130 with SMTP id ei2mr1219287wib.0.1430385920471; Thu, 30 Apr 2015 02:25:20 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.27.194 with SMTP id v2ls395515lag.59.gmail; Thu, 30 Apr 2015 02:25:20 -0700 (PDT) X-Received: by 10.152.116.49 with SMTP id jt17mr2986211lab.82.1430385920346; Thu, 30 Apr 2015 02:25:20 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id p10si1351964laa.17.2015.04.30.02.25.20 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 02:25:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by lbbzk7 with SMTP id zk7so39912433lbb.0 for ; Thu, 30 Apr 2015 02:25:20 -0700 (PDT) X-Received: by 10.112.199.133 with SMTP id jk5mr3108539lbc.32.1430385920261; Thu, 30 Apr 2015 02:25:20 -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.67.65 with SMTP id l1csp2995274lbt; Thu, 30 Apr 2015 02:25:19 -0700 (PDT) X-Received: by 10.70.129.106 with SMTP id nv10mr6606980pdb.160.1430385918477; Thu, 30 Apr 2015 02:25:18 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rm4si2672049pab.74.2015.04.30.02.25.17; Thu, 30 Apr 2015 02:25:18 -0700 (PDT) Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751447AbbD3JZQ (ORCPT + 2 others); Thu, 30 Apr 2015 05:25:16 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:52947 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750800AbbD3JZO (ORCPT ); Thu, 30 Apr 2015 05:25:14 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YnkiW-0005Mn-07; Thu, 30 Apr 2015 11:25:12 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: Sachin Kamat , Christoffer Dall , Shannon Zhao , Jiri Slaby Subject: [patch added to the 3.12 stable tree] KVM: ARM: Remove duplicate include Date: Thu, 30 Apr 2015 11:24:22 +0200 Message-Id: <1430385911-20480-14-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <1430385911-20480-1-git-send-email-jslaby@suse.cz> References: <1430385911-20480-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@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.178 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 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Sachin Kamat This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit 61466710de078c697106fa5b70ec7afc9feab520 upstream. trace.h was included twice. Remove duplicate inclusion. Signed-off-by: Sachin Kamat Signed-off-by: Christoffer Dall Signed-off-by: Shannon Zhao Signed-off-by: Jiri Slaby --- arch/arm/kvm/handle_exit.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c index a92079011a83..0de91fc6de0f 100644 --- a/arch/arm/kvm/handle_exit.c +++ b/arch/arm/kvm/handle_exit.c @@ -26,8 +26,6 @@ #include "trace.h" -#include "trace.h" - typedef int (*exit_handle_fn)(struct kvm_vcpu *, struct kvm_run *); static int handle_svc_hyp(struct kvm_vcpu *vcpu, struct kvm_run *run)