From patchwork Sun Aug 17 09:34:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 4730841 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 1378FC0338 for ; Sun, 17 Aug 2014 09:34:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48E112012B for ; Sun, 17 Aug 2014 09:34:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4A81920122 for ; Sun, 17 Aug 2014 09:34:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751351AbaHQJem (ORCPT ); Sun, 17 Aug 2014 05:34:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54892 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751332AbaHQJel (ORCPT ); Sun, 17 Aug 2014 05:34:41 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7H9Yca6005114 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sun, 17 Aug 2014 05:34:39 -0400 Received: from yakj.usersys.redhat.com (ovpn-112-22.ams2.redhat.com [10.36.112.22]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s7H9Yaw9027482; Sun, 17 Aug 2014 05:34:37 -0400 From: Paolo Bonzini To: kvm@vger.kernel.org Cc: cdb.ta.incharge@gmail.com Subject: [PATCH kvm-unit-tests] x86: isr: fix handle_external_interrupt for 32-bit build Date: Sun, 17 Aug 2014 11:34:33 +0200 Message-Id: <1408268073-24180-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Broken by commit 57b4317dc6758dd8b478609b1312685795654e01. Signed-off-by: Paolo Bonzini --- lib/x86/isr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/x86/isr.c b/lib/x86/isr.c index b0c6f53..833564a 100644 --- a/lib/x86/isr.c +++ b/lib/x86/isr.c @@ -93,13 +93,13 @@ void handle_irq(unsigned vec, void (*func)(isr_regs_t *regs)) void handle_external_interrupt(int vector) { + idt_entry_t *idt = &boot_idt[vector]; + unsigned long entry = + idt->offset0 | ((unsigned long)idt->offset1 << 16); #ifdef __x86_64__ unsigned long tmp; + entry |= ((unsigned long)idt->offset2 << 32); #endif - idt_entry_t *idt = &boot_idt[vector]; - unsigned long entry = - idt->offset0 | ((unsigned long)idt->offset1 << 16) | - ((unsigned long)idt->offset2 << 32); asm volatile( #ifdef __x86_64__ @@ -109,7 +109,7 @@ void handle_external_interrupt(int vector) "push %[sp]\n\t" #endif "pushf\n\t" - "orl $0x200, (%%rsp)\n\t" + "orl $0x200, (%%"R"sp)\n\t" "push $%c[cs]\n\t" "call *%[entry]\n\t" :