From patchwork Sat Oct 8 20:20:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9368279 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E4EA6048F for ; Sat, 8 Oct 2016 20:22:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90B7B28FD0 for ; Sat, 8 Oct 2016 20:22:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 854BE290A7; Sat, 8 Oct 2016 20:22:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A63028FD0 for ; Sat, 8 Oct 2016 20:22:20 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bsy6O-0004Lj-5I; Sat, 08 Oct 2016 20:20:12 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bsy6I-0003BD-D6 for linux-arm-kernel@lists.infradead.org; Sat, 08 Oct 2016 20:20:07 +0000 Received: by mail-wm0-x233.google.com with SMTP id b201so102813108wmb.0 for ; Sat, 08 Oct 2016 13:19:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=9u4JSayzNR4VrIsU8T9jwdn8hKsV7Ry+9TmsTscLeBQ=; b=AtyCA/Sj4Bb+HS+BHTCv9yXxRb2MArB6DvdruSzFxYXe3kfhGO7do+TUcvvqefb/4V 2gvl8cIHDa8S6IjtwX8k4GsicXlxqOFpF+bGCfoinuEPktiRwMwlcOzhQk+tGAj3d4dQ HPARU7NJ3EEC3XYoog59YejkBQBxHSjqOzUxo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=9u4JSayzNR4VrIsU8T9jwdn8hKsV7Ry+9TmsTscLeBQ=; b=MmcyhhL3CPknrybGX+g6ZiTaADZTLNtEBMqjLHAKsxYi4IXTFsaizb6T7KY89riePN dXDdxK4I4Ze8sREeUwenTs0mFB87s6w4V7+tLGneJABTK05qjHS1mvfRkbrrGfZlbXQ1 Anvl1EHTAY5MYBaFCR+L4oyUQEO/hStCql11+BmLDILSdaKy1FzkBepvRVBI1wvCwWnP vmt4f9qVB8Jn8k4ydcqEq8AP+RMtfJGrgE365THGuOzeemAeeFIIHk1cPKl8q5Uo0e8B s52lTyQLf8bGtizIoF4Ile3Fq53gVf6qPoOZO8JkSHoh/muq3iKiVh51LVE0pNI/pBJh fwuA== X-Gm-Message-State: AA6/9RkZKJbsP9o6xIiV9072nuLismYx4e9gXLUHTF1Gv0oaUFcn8awucZ4giXvDYqono0H5 X-Received: by 10.28.127.216 with SMTP id a207mr3748426wmd.118.1475957983086; Sat, 08 Oct 2016 13:19:43 -0700 (PDT) Received: from localhost.localdomain ([94.18.191.146]) by smtp.gmail.com with ESMTPSA id ce6sm26499918wjc.27.2016.10.08.13.19.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 08 Oct 2016 13:19:41 -0700 (PDT) From: Christoffer Dall To: kvmarm@lists.cs.columbia.edu Subject: [PATCH] KVM: arm64: Correct trace exception name after SError handling Date: Sat, 8 Oct 2016 22:20:11 +0200 Message-Id: <20161008202011.30835-1-christoffer.dall@linaro.org> X-Mailer: git-send-email 2.9.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161008_132006_771359_9299E304 X-CRM114-Status: GOOD ( 11.48 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP After commit 9aecafc8 introduced ARM_EXCEPTION_EL1_SERROR we should adjust the description of the exception type for trace events. Signed-off-by: Christoffer Dall --- arch/arm64/include/asm/kvm_arm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index 4b5c977..b942ce4 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -207,7 +207,8 @@ #define kvm_arm_exception_type \ {0, "IRQ" }, \ - {1, "TRAP" } + {1, "SError" }, \ + {2, "TRAP" } #define ECN(x) { ESR_ELx_EC_##x, #x }