From patchwork Fri Apr 24 05:27:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 47499 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f200.google.com (mail-lb0-f200.google.com [209.85.217.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6573920553 for ; Fri, 24 Apr 2015 05:30:46 +0000 (UTC) Received: by lbbqq2 with SMTP id qq2sf8865471lbb.0 for ; Thu, 23 Apr 2015 22:30: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: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=xkaYMQlmyC/TwZ1IFcuIoITTOUY35xYM4SKEHB3jn4g=; b=VStKMHrURHxwdoY5cIBmyJZ6Qslc43t81aBDFh1C5wp59di5wyTBJuI0pSuEbTyTJB zIyQNV/GQM8fpwGYIZHKichMF/4/PYoH0Q8j8GI/T9TmV+wewc4fKBKgraok3TyNn11A VGdocrrzmbRqnpluy8WIdd2TxpnSY4S+xf6dScGjBUhwQXOSnj1nJKoNCniy6xvYXiL7 OA08ZhcdwoUFRtc4vyMPrZZI68d8JVQs8hs4OdhICvRf5Hf4ovRcYvqprFwlw8hNNXwu X7/2mIuk70lgJVK2G2XE5UFm6YpyAlt+IvMEVpmnAF/tYPkLoEzF4x257e0KddaiFFeg hLQw== X-Gm-Message-State: ALoCoQmrlBmeFljZV6FRTNCVXCiQ57WdvbecaBs5Hj4R+F/j9CkOa/eSZoGtX3fD0QMHAZ21unB3 X-Received: by 10.152.23.7 with SMTP id i7mr3204997laf.1.1429853445403; Thu, 23 Apr 2015 22:30:45 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.114 with SMTP id q18ls455421laa.8.gmail; Thu, 23 Apr 2015 22:30:45 -0700 (PDT) X-Received: by 10.152.5.170 with SMTP id t10mr5401791lat.43.1429853445129; Thu, 23 Apr 2015 22:30:45 -0700 (PDT) Received: from mail-la0-f43.google.com (mail-la0-f43.google.com. [209.85.215.43]) by mx.google.com with ESMTPS id j1si7484780lbc.15.2015.04.23.22.30.45 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 23 Apr 2015 22:30:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.43 as permitted sender) client-ip=209.85.215.43; Received: by labbd9 with SMTP id bd9so27543160lab.2 for ; Thu, 23 Apr 2015 22:30:45 -0700 (PDT) X-Received: by 10.112.161.226 with SMTP id xv2mr5445676lbb.106.1429853445035; Thu, 23 Apr 2015 22:30: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.67.65 with SMTP id l1csp977303lbt; Thu, 23 Apr 2015 22:30:44 -0700 (PDT) X-Received: by 10.70.129.17 with SMTP id ns17mr3039442pdb.12.1429853443303; Thu, 23 Apr 2015 22:30:43 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd10si15800741pdb.178.2015.04.23.22.30.42; Thu, 23 Apr 2015 22:30:43 -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 S1754517AbbDXFam (ORCPT + 2 others); Fri, 24 Apr 2015 01:30:42 -0400 Received: from mail-ob0-f171.google.com ([209.85.214.171]:36231 "EHLO mail-ob0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754417AbbDXFal (ORCPT ); Fri, 24 Apr 2015 01:30:41 -0400 Received: by obbeb7 with SMTP id eb7so30118415obb.3 for ; Thu, 23 Apr 2015 22:30:41 -0700 (PDT) X-Received: by 10.202.198.149 with SMTP id w143mr5489302oif.72.1429853441095; Thu, 23 Apr 2015 22:30:41 -0700 (PDT) Received: from localhost ([167.160.116.36]) by mx.google.com with ESMTPSA id na4sm3698242obc.6.2015.04.23.22.30.39 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 23 Apr 2015 22:30:40 -0700 (PDT) From: shannon.zhao@linaro.org To: stable@vger.kernel.org Cc: jslaby@suse.cz, christoffer.dall@linaro.org, shannon.zhao@linaro.org, Sachin Kamat Subject: [PATCH for 3.12.y stable 14/63] KVM: ARM: Remove duplicate include Date: Fri, 24 Apr 2015 13:27:12 +0800 Message-Id: <1429853281-6136-15-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> References: <1429853281-6136-1-git-send-email-shannon.zhao@linaro.org> 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: shannon.zhao@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.43 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 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 --- 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 a920790..0de91fc 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)