> -----Original Message----- > From: ext Jan Kiszka [mailto:jan.kiszka@xxxxxxxxxxx] > Sent: Tuesday, May 17, 2011 5:27 PM > To: Kohl, Bernhard (NSN - DE/Munich) > Cc: kvm@xxxxxxxxxxxxxxx > Subject: Re: [PATCH] Account for Fedora kernels with backported vzalloc > > On 2011-05-17 16:55, Bernhard Kohl wrote: > > kvm-kmod-2.6.38.6 does not compile on Fedora kernels >= 2.6.35.11. > > > > Signed-off-by: Bernhard Kohl <bernhard.kohl@xxxxxxx> > > --- > > configure | 8 ++++++++ > > external-module-compat-comm.h | 5 ++++- > > 2 files changed, 12 insertions(+), 1 deletions(-) > > > > diff --git a/configure b/configure > > index a40c39f..b91587c 100755 > > --- a/configure > > +++ b/configure > > @@ -153,6 +153,13 @@ if [ -n "$no_uname" -a "$want_module" ]; then > > depmod_version=$kernel_version > > fi > > > > +# Check if it is a Fedora kernel, e.g. 2.6.35.13-91.fc14.x86_64 > > +if echo "$kernel_version" | grep -qE '[0-9.-]+\.fc[0-9]+\..+'; then > > + config_fedora_kernel="#define CONFIG_FEDORA_KERNEL 1" > > +else > > + config_fedora_kernel="#undef CONFIG_FEDORA_KERNEL" > > +fi > > + > > Is there no define set by fedora kernels themselves? No, there is nothing in the include/generated/autoconf.h to identify a Fedora kernel. I assume this is the place where CONFIG_SUSE_KERNEL comes from. > > > rm -f include/asm include-compat/asm > > mkdir -p include > > ln -sf asm-"$karch" include/asm > > @@ -175,4 +182,5 @@ EOF > > > > cat <<EOF > kvm-kmod-config.h > > #define KERNEL_EXTRAVERSION $kernel_extraversion > > +$config_fedora_kernel > > EOF > > diff --git a/external-module-compat-comm.h b/external-module-compat- > comm.h > > index 6b6bddb..b7d9b25 100644 > > --- a/external-module-compat-comm.h > > +++ b/external-module-compat-comm.h > > @@ -881,7 +881,10 @@ static inline u32 hash_32(u32 val, unsigned int > bits) > > #define __rcu > > #endif > > > > -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) > > +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37) && \ > > + (!defined(CONFIG_FEDORA_KERNEL) || \ > > + LINUX_VERSION_CODE == KERNEL_VERSION(2,6,35) && > KERNEL_EXTRAVERSION < 11 || \ > > + LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35)) > > #include <linux/vmalloc.h> > > static inline void *vzalloc(unsigned long size) > > { > > Is this intentionally or accidentally targeting Fedora 2.6.35.x only? > Because the commit log may imply some 2.6.36-fc could carry it as well > (if they exist). I assume Fedora 14 will stay with kernel 2.6.35 and Fedora 15 starts with kernel 2.6.38 where the problem does not exist anyway. > > Thanks, > Jan > > -- > Siemens AG, Corporate Technology, CT T DE IT 1 > Corporate Competence Center Embedded Linux -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
