diff -ru SUNWut.orig/utadem/utadem.c SUNWut/utadem/utadem.c --- SUNWut.orig/utadem/utadem.c 2006-10-27 23:26:36.000000000 +0200 +++ SUNWut/utadem/utadem.c 2006-10-27 23:32:58.000000000 +0200 @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -2294,6 +2295,14 @@ return (ret); } +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) +static long +utadem_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + return utadem_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); +} +#endif + static int utadsp_open(struct inode *inode, struct file *file) { @@ -2407,6 +2416,9 @@ write: utadsp_write, poll: utadsp_poll, ioctl: utadem_ioctl, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) + compat_ioctl: utadem_compat_ioctl, +#endif open: utadsp_open, release: utadsp_release, }; @@ -2481,6 +2493,9 @@ owner: THIS_MODULE, llseek: no_llseek, ioctl: utadem_ioctl, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) + compat_ioctl: utadem_compat_ioctl, +#endif open: utamix_open, release: utamix_release, }; @@ -2547,6 +2562,7 @@ } } +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) #if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) register_ioctl32_conversion(UTAIO_GETVERSION, (ioctl_trans_handler_t)0UL); register_ioctl32_conversion(UTAIO_NEWSESSION, (ioctl_trans_handler_t)0UL); @@ -2558,6 +2574,7 @@ register_ioctl32_conversion(UTAIO_UNDERRUN, (ioctl_trans_handler_t)0UL); register_ioctl32_conversion(UTAIO_OVERRUN, (ioctl_trans_handler_t)0UL); #endif /* CONFIG_COMPAT */ +#endif /* hook into sound_core */ dsp_dev = register_sound_dsp(&utadsp_fops, -1); @@ -2610,6 +2627,7 @@ unregister_sound_dsp(dsp_dev); kfree(session_bits); +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) #if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) unregister_ioctl32_conversion(UTAIO_NEWSESSION); unregister_ioctl32_conversion(UTAIO_GETMSG); @@ -2620,6 +2638,7 @@ unregister_ioctl32_conversion(UTAIO_UNDERRUN); unregister_ioctl32_conversion(UTAIO_OVERRUN); #endif /* CONFIG_COMPAT */ +#endif } module_init(utadem_init); diff -ru SUNWut.orig/utdisk/utdiskctl.c SUNWut/utdisk/utdiskctl.c --- SUNWut.orig/utdisk/utdiskctl.c 2006-10-27 23:26:41.000000000 +0200 +++ SUNWut/utdisk/utdiskctl.c 2006-10-27 23:36:05.000000000 +0200 @@ -23,6 +23,7 @@ #include /* module entry-point macros */ #include /* device entry points */ #include /* create_proc_read_entry */ +#include #include /* userland access */ #include "utdisk.h" #include "utdiskctl.h" @@ -61,6 +62,9 @@ size_t count, loff_t *ppos); static int utstk_ioctl(struct inode *inode, struct file *fp, unsigned int command, unsigned long arg); +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) +static long utstk_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg); +#endif static int utstk_get_ctl_major(unsigned long arg, int flag32ptr); static int utstk_get_disk_major(unsigned long arg, int flag32ptr); static int utstk_hotplug(unsigned long arg, int flag32ptr); @@ -89,6 +93,9 @@ .open = utstk_open, .release = utstk_release, .ioctl = utstk_ioctl, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) + .compat_ioctl = utstk_compat_ioctl, +#endif .owner = THIS_MODULE, }; @@ -184,6 +191,7 @@ #if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) /* This function tags all 32-bit ioctls so later code knows pointers are 32-bits */ +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) static int tag32_utstk_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file) { @@ -191,6 +199,15 @@ return(utstk_ioctl(inode, file, cmd | UTDISK_32BIT_PTRS, arg)); } + +#else + +static long +utstk_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + return utstk_ioctl(filp->f_dentry->d_inode, filp, cmd | UTDISK_32BIT_PTRS, arg); +} +#endif #endif /* CONFIG_COMPAT */ @@ -258,6 +275,7 @@ utprintf("%s: major=%d\n", __FUNCTION__, utdc_major); +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) #if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) register_ioctl32_conversion(UTDISK_HOTPLUG, &tag32_utstk_ioctl); register_ioctl32_conversion(UTDISK_UNPLUG, &tag32_utstk_ioctl); @@ -268,6 +286,7 @@ register_ioctl32_conversion(UTDISK_GET_CDB, &tag32_utstk_ioctl); register_ioctl32_conversion(UTDISK_DISK_READY, &tag32_utstk_ioctl); #endif /* CONFIG_COMPAT */ +#endif return (0); } @@ -305,6 +324,7 @@ utdisk_make_request_p = NULL; utdisk_bd_ops = NULL; +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) #if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) unregister_ioctl32_conversion(UTDISK_HOTPLUG); unregister_ioctl32_conversion(UTDISK_UNPLUG); @@ -315,6 +335,7 @@ unregister_ioctl32_conversion(UTDISK_GET_CDB); unregister_ioctl32_conversion(UTDISK_DISK_READY); #endif /* CONFIG_COMPAT */ +#endif } diff -ru SUNWut.orig/utio/utio.c SUNWut/utio/utio.c --- SUNWut.orig/utio/utio.c 2006-10-27 23:26:47.000000000 +0200 +++ SUNWut/utio/utio.c 2006-10-28 00:06:07.000000000 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -193,6 +194,8 @@ static int daemon_write(struct file *file, const char *ubuf, size_t size); static int daemon_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg); +static int compat_daemon_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file); +static int compat_paralleld_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg, struct file *file); static unsigned int daemon_poll(struct file *file, struct poll_table_struct *wait); @@ -1480,6 +1483,11 @@ utio_pmsg_t pmsg; int ret; +#if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) + if (cmd == COMPAT_PPGETTIME) + return (compat_paralleld_ioctl(0, cmd, arg, file)); +#endif + DPRINTF(2, "entering %s()\n", __FUNCTION__); if (!sess || !has_daemon(sess)) @@ -1672,6 +1680,12 @@ /* these don't require the session to exist */ switch (cmd) { +#if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) + case COMPAT_UTIO_GETMSG: + return (compat_daemon_ioctl(0, cmd, arg, file)); + case COMPAT_UTIO_PUTMSG: + return (compat_daemon_ioctl(0, cmd, arg, file)); +#endif case UTIO_GETVERSION: DPRINTF(3, " - UTIO_GETVERSION\n"); return (put_user(UTIO_VERSION, (unsigned long *)arg)); @@ -2026,6 +2040,14 @@ return (ret); } +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) +static long +utio_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) +{ + return utio_ioctl(filp->f_dentry->d_inode, filp, cmd, arg); +} +#endif + static int utio_open(struct inode *inode, struct file *file) { @@ -2187,6 +2209,9 @@ write: utio_write, poll: utio_poll, ioctl: utio_ioctl, +#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,10) + compat_ioctl: utio_compat_ioctl, +#endif open: utio_open, release: utio_release, }; @@ -2255,6 +2280,7 @@ return (-ENOMEM); } +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) #if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) register_ioctl32_conversion(COMPAT_UTIO_GETMSG, &compat_daemon_ioctl); register_ioctl32_conversion(COMPAT_UTIO_PUTMSG, &compat_daemon_ioctl); @@ -2263,6 +2289,7 @@ register_ioctl32_conversion(UTIO_GETMAJOR, (ioctl_trans_handler_t)0UL); register_ioctl32_conversion(UTIO_GETDEVID, (ioctl_trans_handler_t)0UL); #endif /* CONFIG_COMPAT */ +#endif /* init successful */ return (0); @@ -2273,6 +2300,7 @@ { DPRINTF(2, "entering %s()\n", __FUNCTION__); +#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,10) #if defined(CONFIG_COMPAT) || defined(CONFIG_SPARC64) || defined(CONFIG_X86_64) || defined(CONFIG_PPC64) unregister_ioctl32_conversion(COMPAT_UTIO_GETMSG); unregister_ioctl32_conversion(COMPAT_UTIO_PUTMSG); @@ -2281,6 +2309,7 @@ unregister_ioctl32_conversion(UTIO_GETMAJOR); unregister_ioctl32_conversion(UTIO_GETDEVID); #endif /* CONFIG_COMPAT */ +#endif /* * XXX unregister the device