From patchwork Thu Apr 30 12:11:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 47815 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7E1CC2121F for ; Thu, 30 Apr 2015 12:12:53 +0000 (UTC) Received: by wiun10 with SMTP id n10sf4058459wiu.1 for ; Thu, 30 Apr 2015 05:12:52 -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: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=hpXoyXzfN0i7rPUS3RIQ5QThQRm/5Co96BLR+FfEaEw=; b=FGWCi27QR35xeLX9qHK1IGVDn0WfZLjRXnwQowy2fh4hnaJd/Xr4s4H3bWhsAgHAGL YdYf8433NQ86V5QLt7BY/39MD9+2QJvLQpKy5HvcE6sMrTG4RqOQru51uoHc0bKmYqQH yWiwuMUnBKtywECL09Jdx3uwDZ09wjtJjcoo6j/643XDu2RD7mJtmzK7xQ7Y2XyLEtTA cM/jo+dCv6OOaR9Lxu9gY5kdUnLcCWqunoCdTjicM/9IIYwo/62v9DcM/0Wya8S0u8Up GRybmVVRDaUo7Ig618uJPbeo3LuwI7Uk6LlXAlq6RV5UER4kvwmauvmJk9Ha2YvCEfns YNgA== X-Gm-Message-State: ALoCoQkMXQhlZ7YJVhKz3vIsEbvlPjljGZlj/dvyIxs2YYpu6JrWbKOem2J/0T3pU4ShU9bv9Lzd X-Received: by 10.112.51.68 with SMTP id i4mr2403593lbo.13.1430395972782; Thu, 30 Apr 2015 05:12:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.44.135 with SMTP id e7ls397630lam.79.gmail; Thu, 30 Apr 2015 05:12:52 -0700 (PDT) X-Received: by 10.112.13.233 with SMTP id k9mr3580029lbc.57.1430395972645; Thu, 30 Apr 2015 05:12:52 -0700 (PDT) Received: from mail-lb0-f176.google.com (mail-lb0-f176.google.com. [209.85.217.176]) by mx.google.com with ESMTPS id cy4si1639617lac.57.2015.04.30.05.12.52 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Apr 2015 05:12:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.176 as permitted sender) client-ip=209.85.217.176; Received: by lbbuc2 with SMTP id uc2so42779185lbb.2 for ; Thu, 30 Apr 2015 05:12:52 -0700 (PDT) X-Received: by 10.113.10.134 with SMTP id ea6mr3507479lbd.29.1430395972544; Thu, 30 Apr 2015 05:12:52 -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 l1csp3074575lbt; Thu, 30 Apr 2015 05:12:51 -0700 (PDT) X-Received: by 10.70.118.73 with SMTP id kk9mr7817245pdb.150.1430395970638; Thu, 30 Apr 2015 05:12:50 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rd3si3267811pbc.77.2015.04.30.05.12.49; Thu, 30 Apr 2015 05:12:50 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1751644AbbD3MMq (ORCPT + 28 others); Thu, 30 Apr 2015 08:12:46 -0400 Received: from ip4-83-240-67-251.cust.nbox.cz ([83.240.67.251]:53594 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751306AbbD3MMe (ORCPT ); Thu, 30 Apr 2015 08:12:34 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.85) (envelope-from ) id 1YnnKS-00089b-Rs; Thu, 30 Apr 2015 14:12:32 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Sachin Kamat , Christoffer Dall , Shannon Zhao , Jiri Slaby Subject: [PATCH 3.12 14/63] KVM: ARM: Remove duplicate include Date: Thu, 30 Apr 2015 14:11:43 +0200 Message-Id: <6ae675035bf4fc67801f0fe48de40401ecd55262.1430387326.git.jslaby@suse.cz> X-Mailer: git-send-email 2.3.5 In-Reply-To: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> References: <45aaf85687dd6ac119c55c5ec0dbe0bef0e62235.1430387326.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.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.176 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 3.12-stable review patch. If anyone has any objections, please let me 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)