a7y18lte-ubports/android_kernel_samsung_universal7885
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ALSA] Remove BKL from sound/core/info.c

Browse Source 
Modules: ALSA Core

Remove BKL from sound/core/info.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Ingo Molnar 2006-01-09 16:44:46 +01:00 committed by Jaroslav Kysela
parent d0bd41e289
commit d99e98891c
1 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sound/core/info.c
View File

@ -444,8 +444,8 @@ static unsigned int snd_info_entry_poll(struct file *file, poll_table * wait)
return mask; return mask;
} }
static inline int _snd_info_entry_ioctl(struct inode *inode, struct file *file, static long snd_info_entry_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
struct snd_info_private_data *data; struct snd_info_private_data *data;
struct snd_info_entry *entry; struct snd_info_entry *entry;
@ -465,17 +465,6 @@ static inline int _snd_info_entry_ioctl(struct inode *inode, struct file *file,
return -ENOTTY; return -ENOTTY;
} }
/* FIXME: need to unlock BKL to allow preemption */
static int snd_info_entry_ioctl(struct inode *inode, struct file *file,
unsigned int cmd, unsigned long arg)
{
int err;
unlock_kernel();
err = _snd_info_entry_ioctl(inode, file, cmd, arg);
lock_kernel();
return err;
}
static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma) static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
{ {
struct inode *inode = file->f_dentry->d_inode; struct inode *inode = file->f_dentry->d_inode;
@ -499,15 +488,15 @@ static int snd_info_entry_mmap(struct file *file, struct vm_area_struct *vma)
static struct file_operations snd_info_entry_operations = static struct file_operations snd_info_entry_operations =
{ {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = snd_info_entry_llseek, .llseek = snd_info_entry_llseek,
.read = snd_info_entry_read, .read = snd_info_entry_read,
.write = snd_info_entry_write, .write = snd_info_entry_write,
.poll = snd_info_entry_poll, .poll = snd_info_entry_poll,
.ioctl = snd_info_entry_ioctl, .unlocked_ioctl = snd_info_entry_ioctl,
.mmap = snd_info_entry_mmap, .mmap = snd_info_entry_mmap,
.open = snd_info_entry_open, .open = snd_info_entry_open,
.release = snd_info_entry_release, .release = snd_info_entry_release,
}; };
/** /**