diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 07:52:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-29 07:52:16 -0700 |
| commit | ce949717b559709423c1ef716a9db16d1dcadaed (patch) | |
| tree | 003c5c064cd6104c8bff431e3431314bd614d7e0 /drivers | |
| parent | Merge branch 'devicetree/merge' of git://git.secretlab.ca/git/linux-2.6 (diff) | |
| parent | lguest: move process freezing before pending signals check (diff) | |
| download | linux-dev-ce949717b559709423c1ef716a9db16d1dcadaed.tar.xz linux-dev-ce949717b559709423c1ef716a9db16d1dcadaed.zip | |
Merge git://github.com/rustyrussell/linux
* git://github.com/rustyrussell/linux:
lguest: move process freezing before pending signals check
lguest: don't allow KVM-detection cpuid.
lguest: Allow running under paravirt-enabled KVM.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/lguest/core.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c index 2535933c49f8..b5fdcb78a75b 100644 --- a/drivers/lguest/core.c +++ b/drivers/lguest/core.c @@ -232,6 +232,13 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user) } } + /* + * All long-lived kernel loops need to check with this horrible + * thing called the freezer. If the Host is trying to suspend, + * it stops us. + */ + try_to_freeze(); + /* Check for signals */ if (signal_pending(current)) return -ERESTARTSYS; @@ -246,13 +253,6 @@ int run_guest(struct lg_cpu *cpu, unsigned long __user *user) try_deliver_interrupt(cpu, irq, more); /* - * All long-lived kernel loops need to check with this horrible - * thing called the freezer. If the Host is trying to suspend, - * it stops us. - */ - try_to_freeze(); - - /* * Just make absolutely sure the Guest is still alive. One of * those hypercalls could have been fatal, for example. */ @@ -313,7 +313,7 @@ static int __init init(void) int err; /* Lguest can't run under Xen, VMI or itself. It does Tricky Stuff. */ - if (paravirt_enabled()) { + if (get_kernel_rpl() != 0) { printk("lguest is afraid of being a guest\n"); return -EPERM; } |