leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

apm_32: BKL pushdown

Browse Source 
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2008-05-20 19:15:34 +02:00 committed by Jonathan Corbet
parent 2861ead38b
commit 864fe51671
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/apm_32.c
View File

@ -204,6 +204,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/smp_lock.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/stddef.h> #include <linux/stddef.h>
#include <linux/timer.h> #include <linux/timer.h>
@ -1544,10 +1545,12 @@ static int do_open(struct inode *inode, struct file *filp)
{ {
struct apm_user *as; struct apm_user *as;
lock_kernel();
as = kmalloc(sizeof(*as), GFP_KERNEL); as = kmalloc(sizeof(*as), GFP_KERNEL);
if (as == NULL) { if (as == NULL) {
printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n", printk(KERN_ERR "apm: cannot allocate struct of size %d bytes\n",
sizeof(*as)); sizeof(*as));
unlock_kernel();
return -ENOMEM; return -ENOMEM;
} }
as->magic = APM_BIOS_MAGIC; as->magic = APM_BIOS_MAGIC;
@ -1569,6 +1572,7 @@ static int do_open(struct inode *inode, struct file *filp)
user_list = as; user_list = as;
spin_unlock(&user_list_lock); spin_unlock(&user_list_lock);
filp->private_data = as; filp->private_data = as;
unlock_kernel();
return 0; return 0;
} }