From patchwork Sat Aug 22 00:38:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zachary Amsden X-Patchwork-Id: 43288 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 n7M0hVCS027319 for ; Sat, 22 Aug 2009 00:43:31 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932726AbZHVAnP (ORCPT ); Fri, 21 Aug 2009 20:43:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932723AbZHVAnP (ORCPT ); Fri, 21 Aug 2009 20:43:15 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13127 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932696AbZHVAnP (ORCPT ); Fri, 21 Aug 2009 20:43:15 -0400 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n7M0hG63024606 for ; Fri, 21 Aug 2009 20:43:16 -0400 Received: from [10.32.10.9] (vpn-10-9.str.redhat.com [10.32.10.9]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n7M0hD0m028852; Fri, 21 Aug 2009 20:43:14 -0400 Message-ID: <4A8F3E00.9090103@redhat.com> Date: Fri, 21 Aug 2009 14:38:24 -1000 From: Zachary Amsden User-Agent: Thunderbird 2.0.0.19 (X11/20090317) MIME-Version: 1.0 To: Avi Kivity , Eduardo Habkost , kvm@vger.kernel.org Subject: [PATCH] kvm-kmod vma_kernel_pagesize compatability X-Enigmail-Version: 0.95.7 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Patch speaks for itself. commit b5cd58bc3e7bddf0a9735d5c13c36e2221a7f616 Author: Zachary Amsden Date: Fri Aug 21 14:34:37 2009 -1000 Make vma_kernel_pagesize a kvm compat API; this fixes the build with new kernels synced to 2.6.31 compiling externally for older systems. Signed-off-by: Zachary Amsden diff --git a/external-module-compat-comm.h b/external-module-compat-comm.h index 3a31d51..da1a4f0 100644 --- a/external-module-compat-comm.h +++ b/external-module-compat-comm.h @@ -958,7 +958,7 @@ static inline int kvm_eventfd_signal(struct eventfd_ctx *ctx, int n) #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) static inline -unsigned long vma_kernel_pagesize(struct vm_area_struct *vma) +unsigned long kvm_vma_kernel_pagesize(struct vm_area_struct *vma) { struct hstate *hstate; diff --git a/linux-2.6 b/linux-2.6 index 5383e99..779cc54 160000 --- a/linux-2.6 +++ b/linux-2.6 @@ -1 +1 @@ -Subproject commit 5383e9982ee230b06b3c385e675ae6fc7846c40f +Subproject commit 779cc54dbccaa3a00d70a9d61d090be5d9ccc903 diff --git a/sync b/sync index ac8ea05..539a3f0 100755 --- a/sync +++ b/sync @@ -38,6 +38,7 @@ def __hack(data): 'init_srcu_struct cleanup_srcu_struct srcu_read_lock ' 'srcu_read_unlock synchronize_srcu srcu_batches_completed ' 'do_machine_check eventfd_signal get_desc_base get_desc_limit ' + 'vma_kernel_pagesize ' ) anon_inodes = anon_inodes_exit = False mce = False