diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:45:50 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 16:45:50 -0400 |
| commit | a7e1aabb28e8154ce987b622fd78d80a1ca39361 (patch) | |
| tree | 8671d8faf51d43665045b7362a177a23dc88921b /include/linux | |
| parent | 111ad119d1765b1bbef2629a5f2bd825caeb7e74 (diff) | |
| parent | 996ba96a97f7406052486682846d68935a60e986 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
lguest: Fix in/out emulation
lguest: Fix translation count about wikipedia's cpuid page
lguest: Fix three simple typos in comments
lguest: update comments
lguest: Simplify device initialization.
lguest: don't rewrite vmcall instructions
lguest: remove remaining vmcall
lguest: use a special 1:1 linear pagetable mode until first switch.
lguest: Do not exit on non-fatal errors
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/lguest.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/lguest.h b/include/linux/lguest.h index 2fb1dcbcb5aa..9962c6bb1311 100644 --- a/include/linux/lguest.h +++ b/include/linux/lguest.h | |||
| @@ -59,8 +59,6 @@ struct lguest_data { | |||
| 59 | unsigned long reserve_mem; | 59 | unsigned long reserve_mem; |
| 60 | /* KHz for the TSC clock. */ | 60 | /* KHz for the TSC clock. */ |
| 61 | u32 tsc_khz; | 61 | u32 tsc_khz; |
| 62 | /* Page where the top-level pagetable is */ | ||
| 63 | unsigned long pgdir; | ||
| 64 | 62 | ||
| 65 | /* Fields initialized by the Guest at boot: */ | 63 | /* Fields initialized by the Guest at boot: */ |
| 66 | /* Instruction range to suppress interrupts even if enabled */ | 64 | /* Instruction range to suppress interrupts even if enabled */ |