Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus

[pandora-kernel.git] / include / linux / lguest.h

diff --git a/include/linux/lguest.h b/include/linux/lguest.h
index 7bc1440..9962c6b 100644 (file)
--- a/include/linux/lguest.h
+++ b/include/linux/lguest.h
@@ -1,5 +1,7 @@
-/* Things the lguest guest needs to know.  Note: like all lguest interfaces,
- * this is subject to wild and random change between versions. */
+/*
+ * Things the lguest guest needs to know.  Note: like all lguest interfaces,
+ * this is subject to wild and random change between versions.
+ */
 #ifndef _LINUX_LGUEST_H
 #define _LINUX_LGUEST_H
 
@@ -11,32 +13,41 @@
 #define LG_CLOCK_MIN_DELTA     100UL
 #define LG_CLOCK_MAX_DELTA     ULONG_MAX
 
-/*G:032 The second method of communicating with the Host is to via "struct
+/*G:031
+ * The second method of communicating with the Host is to via "struct
  * lguest_data".  Once the Guest's initialization hypercall tells the Host where
- * this is, the Guest and Host both publish information in it. :*/
-struct lguest_data
-{
-       /* 512 == enabled (same as eflags in normal hardware).  The Guest
-        * changes interrupts so often that a hypercall is too slow. */
+ * this is, the Guest and Host both publish information in it.
+:*/
+struct lguest_data {
+       /*
+        * 512 == enabled (same as eflags in normal hardware).  The Guest
+        * changes interrupts so often that a hypercall is too slow.
+        */
        unsigned int irq_enabled;
        /* Fine-grained interrupt disabling by the Guest */
        DECLARE_BITMAP(blocked_interrupts, LGUEST_IRQS);
 
-       /* The Host writes the virtual address of the last page fault here,
+       /*
+        * The Host writes the virtual address of the last page fault here,
         * which saves the Guest a hypercall.  CR2 is the native register where
-        * this address would normally be found. */
+        * this address would normally be found.
+        */
        unsigned long cr2;
 
        /* Wallclock time set by the Host. */
        struct timespec time;
 
-       /* Interrupt pending set by the Host.  The Guest should do a hypercall
-        * if it re-enables interrupts and sees this set (to X86_EFLAGS_IF). */
+       /*
+        * Interrupt pending set by the Host.  The Guest should do a hypercall
+        * if it re-enables interrupts and sees this set (to X86_EFLAGS_IF).
+        */
        int irq_pending;
 
-       /* Async hypercall ring.  Instead of directly making hypercalls, we can
+       /*
+        * Async hypercall ring.  Instead of directly making hypercalls, we can
         * place them in here for processing the next time the Host wants.
-        * This batching can be quite efficient. */
+        * This batching can be quite efficient.
+        */
 
        /* 0xFF == done (set by Host), 0 == pending (set by Guest). */
        u8 hcall_status[LHCALL_RING_SIZE];
@@ -48,8 +59,6 @@ struct lguest_data
        unsigned long reserve_mem;
        /* KHz for the TSC clock. */
        u32 tsc_khz;
-       /* Page where the top-level pagetable is */
-       unsigned long pgdir;
 
 /* Fields initialized by the Guest at boot: */
        /* Instruction range to suppress interrupts even if enabled */