diff options
Diffstat (limited to 'drivers/lguest')
| -rw-r--r-- | drivers/lguest/core.c | 2 | ||||
| -rw-r--r-- | drivers/lguest/lguest_user.c | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c index 90663e01a56e..60156dfdc608 100644 --- a/drivers/lguest/core.c +++ b/drivers/lguest/core.c | |||
| @@ -224,7 +224,7 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user) | |||
| 224 | break; | 224 | break; |
| 225 | 225 | ||
| 226 | /* If the Guest asked to be stopped, we sleep. The Guest's | 226 | /* If the Guest asked to be stopped, we sleep. The Guest's |
| 227 | * clock timer or LHCALL_BREAK from the Waker will wake us. */ | 227 | * clock timer or LHREQ_BREAK from the Waker will wake us. */ |
| 228 | if (cpu->halted) { | 228 | if (cpu->halted) { |
| 229 | set_current_state(TASK_INTERRUPTIBLE); | 229 | set_current_state(TASK_INTERRUPTIBLE); |
| 230 | schedule(); | 230 | schedule(); |
diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c index 34bc017b8b3c..b8ee103eed5f 100644 --- a/drivers/lguest/lguest_user.c +++ b/drivers/lguest/lguest_user.c | |||
| @@ -307,9 +307,8 @@ static int close(struct inode *inode, struct file *file) | |||
| 307 | * kmalloc()ed string, either of which is ok to hand to kfree(). */ | 307 | * kmalloc()ed string, either of which is ok to hand to kfree(). */ |
| 308 | if (!IS_ERR(lg->dead)) | 308 | if (!IS_ERR(lg->dead)) |
| 309 | kfree(lg->dead); | 309 | kfree(lg->dead); |
| 310 | /* We clear the entire structure, which also marks it as free for the | 310 | /* Free the memory allocated to the lguest_struct */ |
| 311 | * next user. */ | 311 | kfree(lg); |
| 312 | memset(lg, 0, sizeof(*lg)); | ||
| 313 | /* Release lock and exit. */ | 312 | /* Release lock and exit. */ |
| 314 | mutex_unlock(&lguest_lock); | 313 | mutex_unlock(&lguest_lock); |
| 315 | 314 | ||
