Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd135ebb authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Linus Torvalds
Browse files

kvm: provide kvm.h for all architecture: fixes headers_install



Currently include/linux/kvm.h is not considered by make headers_install,
because Kbuild cannot handle " unifdef-$(CONFIG_FOO) += foo.h.  This problem
was introduced by

commit fb56dbb3
Author: Avi Kivity <avi@qumranet.com>
Date:   Sun Dec 2 10:50:06 2007 +0200

    KVM: Export include/linux/kvm.h only if $ARCH actually supports KVM

    Currently, make headers_check barfs due to <asm/kvm.h>, which <linux/kvm.h>
    includes, not existing.  Rather than add a zillion <asm/kvm.h>s, export kvm.
    only if the arch actually supports it.

    Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>

which makes this an 2.6.25 regression.

One way of solving the issue is to enhance Kbuild, but Avi and David conviced
me, that changing headers_install is not the way to go.  This patch changes
the definition for linux/kvm.h to unifdef-y.

If  unifdef-y is used for linux/kvm.h "make headers_check" will fail on all
architectures without asm/kvm.h.  Therefore, this patch also provides
asm/kvm.h on all architectures.

Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Acked-by: default avatarAvi Kivity <avi@qumranet.com>
Cc: Sam Ravnborg <sam@ravnborg.org
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8eb224cd
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
#ifndef __LINUX_KVM_ALPHA_H
#define __LINUX_KVM_ALPHA_H

/* alpha does not support KVM */

#endif

include/asm-arm/kvm.h

0 → 100644
+6 −0
Original line number Diff line number Diff line
#ifndef __LINUX_KVM_ARM_H
#define __LINUX_KVM_ARM_H

/* arm does not support KVM */

#endif
+6 −0
Original line number Diff line number Diff line
#ifndef __LINUX_KVM_AVR32_H
#define __LINUX_KVM_AVR32_H

/* avr32 does not support KVM */

#endif
+6 −0
Original line number Diff line number Diff line
#ifndef __LINUX_KVM_BLACKFIN_H
#define __LINUX_KVM_BLACKFIN_H

/* blackfin does not support KVM */

#endif

include/asm-cris/kvm.h

0 → 100644
+6 −0
Original line number Diff line number Diff line
#ifndef __LINUX_KVM_CRIS_H
#define __LINUX_KVM_CRIS_H

/* cris does not support KVM */

#endif
Loading