1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
|
--- ../alsa-kernel/core/control.c 2005-10-30 19:55:40.000000000 +0100
+++ control.c 2005-10-30 19:24:49.000000000 +0100
@@ -1,3 +1,4 @@
+#define __NO_VERSION__
/*
* Routines for driver control interface
* Copyright (c) by Jaroslav Kysela <perex@suse.cz>
@@ -1216,25 +1217,44 @@
/*
* ioctl32 compat
*/
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) && defined(CONFIG_SND_HAVE_NEW_IOCTL)
#include "control_compat.c"
#else
#define snd_ctl_ioctl_compat NULL
#endif
+#ifndef CONFIG_SND_HAVE_NEW_IOCTL
+/* need to unlock BKL to allow preemption */
+static int snd_ctl_ioctl_old(struct inode *inode, struct file * file,
+ unsigned int cmd, unsigned long arg)
+{
+ int err;
+ unlock_kernel();
+ err = snd_ctl_ioctl(file, cmd, arg);
+ lock_kernel();
+ return err;
+}
+#endif
+
/*
* INIT PART
*/
static struct file_operations snd_ctl_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.read = snd_ctl_read,
.open = snd_ctl_open,
.release = snd_ctl_release,
.poll = snd_ctl_poll,
+#ifdef CONFIG_SND_HAVE_NEW_IOCTL
.unlocked_ioctl = snd_ctl_ioctl,
.compat_ioctl = snd_ctl_ioctl_compat,
+#else
+ .ioctl = snd_ctl_ioctl_old,
+#endif
.fasync = snd_ctl_fasync,
};
|
