提交 ea4bfdf5 编写于 作者: C Christian Borntraeger 提交者: Martin Schwidefsky

[S390] s390: Fix build for !CONFIG_S390_GUEST + CONFIG_VIRTIO_CONSOLE

The s390 kernel does not compile if virtio console is enabled, but guest
support is disabled:

  LD      .tmp_vmlinux1
arch/s390/kernel/built-in.o: In function `setup_arch':
/space/linux-2.5/arch/s390/kernel/setup.c:773: undefined reference to
`s390_virtio_console_init'

The fix is related to
commit 99e65c92
Author: Christian Borntraeger <borntraeger@de.ibm.com>
Date:   Fri Jul 25 15:50:04 2008 +0200
    KVM: s390: Fix guest kconfig

Which changed the build process to build kvm_virtio.c only if CONFIG_S390_GUEST
is set. We must ifdef the prototype in the header file accordingly.
Reported-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: NMartin Schwidefsky <schwidefsky@de.ibm.com>
上级 7f5a8ba6
...@@ -52,7 +52,7 @@ struct kvm_vqconfig { ...@@ -52,7 +52,7 @@ struct kvm_vqconfig {
#ifdef __KERNEL__ #ifdef __KERNEL__
/* early virtio console setup */ /* early virtio console setup */
#ifdef CONFIG_VIRTIO_CONSOLE #ifdef CONFIG_S390_GUEST
extern void s390_virtio_console_init(void); extern void s390_virtio_console_init(void);
#else #else
static inline void s390_virtio_console_init(void) static inline void s390_virtio_console_init(void)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册