git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git]
/
drivers
/
misc
/
vmw_balloon.c
diff --git
a/drivers/misc/vmw_balloon.c
b/drivers/misc/vmw_balloon.c
index
4d2ea8e
..
6df5a55
100644
(file)
--- a/
drivers/misc/vmw_balloon.c
+++ b/
drivers/misc/vmw_balloon.c
@@
-785,7
+785,7
@@
static int __init vmballoon_init(void)
if (x86_hyper != &x86_hyper_vmware)
return -ENODEV;
if (x86_hyper != &x86_hyper_vmware)
return -ENODEV;
- vmballoon_wq = create_freez
e
able_workqueue("vmmemctl");
+ vmballoon_wq = create_freezable_workqueue("vmmemctl");
if (!vmballoon_wq) {
pr_err("failed to create workqueue\n");
return -ENOMEM;
if (!vmballoon_wq) {
pr_err("failed to create workqueue\n");
return -ENOMEM;