Fix compile with !CONFIG_VT
Linus, please apply:
Architectures using the generic 32/64-bit ioctl() compatibility shims will get a link error if CONFIG_VT is not defined, since the compatbility ioctl() code calls functions in drivers/char/vt.c which is only included in the build if CONFIG_VT is set.
This fixes the compile with a couple of #ifdefs:
fs/compat_ioctl.c renamed from scratch/anton/export/fs/compat_ioctl.c +6 -0
@@ -1562,6 +1562,8 @@extern int tty_ioctl (struct inode * inode,struct file * file,unsigned int cmd,unsigned long arg); +#ifdef CONFIG_VT +static int vt_check (struct file *file) {struct tty_struct *tty;
@@ -1693,6 +1695,8 @@ return 0; } +#endif /* CONFIG_VT */ +static int do_smb_getmountuid (unsigned int fd,unsigned int cmd,unsigned long arg) {mm_segment_t old_fs =get_fs ();
@@ -2398,11 +2402,13 @@ HANDLE_IOCTL(LOOP_GET_STATUS, loop_status)#define AUTOFS_IOC_SETTIMEOUT32 _IOWR(0x93,0x64,unsigned int) HANDLE_IOCTL(AUTOFS_IOC_SETTIMEOUT32, ioc_settimeout) +#ifdef CONFIG_VT HANDLE_IOCTL(PIO_FONTX, do_fontx_ioctl) HANDLE_IOCTL(GIO_FONTX, do_fontx_ioctl) HANDLE_IOCTL(PIO_UNIMAP, do_unimap_ioctl) HANDLE_IOCTL(GIO_UNIMAP, do_unimap_ioctl) HANDLE_IOCTL(KDFONTOP, do_kdfontop_ioctl) +#endif HANDLE_IOCTL(EXT2_IOC32_GETFLAGS, do_ext2_ioctl) HANDLE_IOCTL(EXT2_IOC32_SETFLAGS, do_ext2_ioctl)HANDLE_IOCTL (EXT2_IOC32_GETVERSION , do_ext2_ioctl)
Signature · 4 lines
David Gibson | For every complex problem there is a [email protected] | solution which is simple, neat and | wrong. http://www.ozlabs.org/people/dgibson