From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: Re: [PATCH] qemu-kvm: kvm headers update Date: Mon, 05 Oct 2009 17:38:35 +0200 Message-ID: <4ACA12FB.7030805@redhat.com> References: <20091005094612.GA30068@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: kvm@vger.kernel.org To: "Michael S. Tsirkin" Return-path: Received: from mx1.redhat.com ([209.132.183.28]:61608 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753626AbZJEPjD (ORCPT ); Mon, 5 Oct 2009 11:39:03 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n95Fcb8l002426 for ; Mon, 5 Oct 2009 11:38:37 -0400 In-Reply-To: <20091005094612.GA30068@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 10/05/2009 11:46 AM, Michael S. Tsirkin wrote: > Update headers from linux 2.6.32-rc1, this mainly > adds irqfd which will make it easier to add vhost, > down the line. Also reduce code duplication by including > kvm_types.h instead of copying it. > > Signed-off-by: Michael S. Tsirkin > --- > kvm/include/linux/kvm.h | 131 +++++++++++++++---------------------- > kvm/include/linux/kvm_para.h | 56 +--------------- > kvm/include/x86/asm/kvm.h | 46 +------------ > kvm/include/x86/asm/kvm_para.h | 141 +--------------------------------------- > 4 files changed, 61 insertions(+), 313 deletions(-) > > diff --git a/kvm/include/linux/kvm.h b/kvm/include/linux/kvm.h > index 801865d..2c9a209 100644 > --- a/kvm/include/linux/kvm.h > +++ b/kvm/include/linux/kvm.h > @@ -1,43 +1,4 @@ > -#ifndef KVM_UNIFDEF_H > -#define KVM_UNIFDEF_H > - > -#ifdef __i386__ > -#ifndef CONFIG_X86_32 > -#define CONFIG_X86_32 1 > -#endif > -#endif > - > -#ifdef __x86_64__ > -#ifndef CONFIG_X86_64 > -#define CONFIG_X86_64 1 > -#endif > -#endif > - > -#if defined(__i386__) || defined (__x86_64__) > -#ifndef CONFIG_X86 > -#define CONFIG_X86 1 > -#endif > -#endif > - > -#ifdef __ia64__ > -#ifndef CONFIG_IA64 > -#define CONFIG_IA64 1 > -#endif > -#endif > - > -#ifdef __PPC__ > -#ifndef CONFIG_PPC > -#define CONFIG_PPC 1 > -#endif > -#endif > - > -#ifdef __s390__ > -#ifndef CONFIG_S390 > -#define CONFIG_S390 1 > -#endif > -#endif > - > -#endif > Why are you dropping these? Any dependencies on CONFIG_ will be broken. Or is this the output of 'make headers_install'? -- error compiling committee.c: too many arguments to function