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
|
--- ../alsa-kernel/core/rawmidi.c 2005-01-20 16:21:56.039226390 +0100
+++ rawmidi.c 2005-01-20 16:59:15.565037668 +0100
@@ -1267,12 +1267,25 @@
/*
*/
-#ifdef CONFIG_COMPAT
+#if defined(CONFIG_COMPAT) && defined(CONFIG_SND_HAVE_NEW_IOCTL)
#include "rawmidi_compat.c"
#else
#define snd_rawmidi_ioctl_compat NULL
#endif
+#ifndef CONFIG_SND_HAVE_NEW_IOCTL
+/* need to unlock BKL to allow preemption */
+static int snd_rawmidi_ioctl_old(struct inode *inode, struct file * file,
+ unsigned int cmd, unsigned long arg)
+{
+ int err;
+ unlock_kernel();
+ err = snd_rawmidi_ioctl(file, cmd, arg);
+ lock_kernel();
+ return err;
+}
+#endif
+
/*
*/
@@ -1337,14 +1350,20 @@
static struct file_operations snd_rawmidi_f_ops =
{
+#ifndef LINUX_2_2
.owner = THIS_MODULE,
+#endif
.read = snd_rawmidi_read,
.write = snd_rawmidi_write,
.open = snd_rawmidi_open,
.release = snd_rawmidi_release,
.poll = snd_rawmidi_poll,
+#ifdef CONFIG_SND_HAVE_NEW_IOCTL
.unlocked_ioctl = snd_rawmidi_ioctl,
.compat_ioctl = snd_rawmidi_ioctl_compat,
+#else
+ .ioctl = snd_rawmidi_ioctl_old,
+#endif
};
static struct snd_minor snd_rawmidi_reg =
|
