Emergency commit to fix a gitastrophe
authorRon Minnich <rminnich@gmail.com>
Fri, 27 Feb 2015 16:06:37 +0000 (08:06 -0800)
committerRon Minnich <rminnich@gmail.com>
Fri, 27 Feb 2015 16:06:37 +0000 (08:06 -0800)
Somehow 10 days ago I was on the wrong branch, sorry.

Signed-off-by: Ron Minnich <rminnich@gmail.com>
kern/arch/x86/Kbuild
kern/drivers/dev/proc.c

index d16eaac..676ff2c 100644 (file)
@@ -31,6 +31,3 @@ obj-y                                         += trap.o trap64.o
 obj-y                                          += trapentry64.o
 obj-y                                          += usb.o
 
-# VMM support. Always leave this in to ensure we don't break anything.
-obj-y                                          += vmm/
-
index 8e7f0f3..3711ccc 100644 (file)
@@ -1486,7 +1486,6 @@ static void procctlreq(struct proc *p, char *va, int n)
                        spin_on(p->env_cr3);
                        break;
                case CMvminit:
-                       vminit(current);
                        break;
        }
        poperror();