diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 15:03:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-03 15:03:05 +1000 |
| commit | f3502ff5360a23e897b04215278de0fc2ba28fcd (patch) | |
| tree | ddef124c9170c3e2e2f6a6dbae7af2f2a6e3c7fe /include/asm-s390 | |
| parent | dd453950b674145f26a351f6da7b488c7dc34337 (diff) | |
| parent | dc327fb0ceb8c4f9309dbc166dd0b3f6d4dd2d38 (diff) | |
Merge branch 'quilt/rr'
Conflicts:
drivers/char/hvc_console.h
kernel/stop_machine.c
Diffstat (limited to 'include/asm-s390')
| -rw-r--r-- | include/asm-s390/kvm_virtio.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/asm-s390/kvm_virtio.h b/include/asm-s390/kvm_virtio.h index 5c871a990c29..146100224def 100644 --- a/include/asm-s390/kvm_virtio.h +++ b/include/asm-s390/kvm_virtio.h @@ -50,4 +50,14 @@ struct kvm_vqconfig { #define KVM_S390_VIRTIO_RESET 1 #define KVM_S390_VIRTIO_SET_STATUS 2 +#ifdef __KERNEL__ +/* early virtio console setup */ +#ifdef CONFIG_VIRTIO_CONSOLE +extern void s390_virtio_console_init(void); +#else +static inline void s390_virtio_console_init(void) +{ +} +#endif /* CONFIG_VIRTIO_CONSOLE */ +#endif /* __KERNEL__ */ #endif |