From patchwork Sun Oct 11 06:28:23 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 52986 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9B6f5nj004624 for ; Sun, 11 Oct 2009 06:41:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751073AbZJKGgf (ORCPT ); Sun, 11 Oct 2009 02:36:35 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751140AbZJKGgf (ORCPT ); Sun, 11 Oct 2009 02:36:35 -0400 Received: from qw-out-2122.google.com ([74.125.92.26]:11701 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750829AbZJKGge (ORCPT ); Sun, 11 Oct 2009 02:36:34 -0400 Received: by qw-out-2122.google.com with SMTP id 9so323369qwb.37 for ; Sat, 10 Oct 2009 23:35:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:content-type :date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=1taHYMEToTd5L6C4ViCYlKxmk0xHKn26sjS79BOZ/x4=; b=TRm3BqU1d5QruWyAoQ1I2JQ8Ia5RULjABKtTFIZ/P15n3dyx4JvR8tUjnqpWFqOw/a 0KGV2wfYhEpyzKSXengPtMAVLKdIO0kY0OUOanbYY6lu/AK2Vh/xxSqpGYxUwmmrnepv 5W8tlXX3RTLevXAZWx3gBOk3JhTLp2I+ppxTs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; b=wHj2mF08STQxXpWqdTsgzfoENFumYUd9VMCfYFS01QJ2czu4dmkM0/bD2y/QCZj2NI li5iMjfrdNY/ts2csd2HqF/mqI5vjWvc7IdMM6gVZVSxeQbfNwYDZBbMjC8jco3tOv3a N/eJrglH0Pt0gaOwKC3QFMBGDf1Q/GLshWy8M= Received: by 10.224.110.135 with SMTP id n7mr3938986qap.185.1255242509586; Sat, 10 Oct 2009 23:28:29 -0700 (PDT) Received: from ?170.51.45.12? ([170.51.45.12]) by mx.google.com with ESMTPS id 7sm3573500qwf.28.2009.10.10.23.28.27 (version=SSLv3 cipher=RC4-MD5); Sat, 10 Oct 2009 23:28:29 -0700 (PDT) Subject: [PATCH 1/1] kvm/mmu: Resolve compile warning From: javier martinez canillas To: avi@redhat.com, kvm@vger.kernel.org, kernel-janitors@vger.kernel.org Date: Sun, 11 Oct 2009 02:28:23 -0400 Message-Id: <1255242503.4326.39.camel@laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.26.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 20a2cd1..a0b2610 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -767,7 +767,7 @@ static int kvm_set_pte_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data) { int need_flush = 0; u64 *spte, new_spte; - pte_t *ptep = (pte_t *)data; + pte_t *ptep = (pte_t *)(unsigned long)data; pfn_t new_pfn; WARN_ON(pte_huge(*ptep)); @@ -846,7 +846,7 @@ int kvm_unmap_hva(struct kvm *kvm, unsigned long hva) void kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) { - kvm_handle_hva(kvm, hva, (u64)&pte, kvm_set_pte_rmapp); + kvm_handle_hva(kvm, hva, (unsigned long)&pte, kvm_set_pte_rmapp); } static int kvm_age_rmapp(struct kvm *kvm, unsigned long *rmapp, u64 data)