From afca9193dcc864787737405c5cde8039218925fa Mon Sep 17 00:00:00 2001 From: Adrian Knoth Date: Mon, 11 Jul 2011 18:07:14 +0200 Subject: [PATCH] --- yaml --- r: 255291 b: refs/heads/master c: 64be11583bac5ca65d017a5c4288f10b2bcf1928 h: refs/heads/master i: 255289: 92c35d679e9583df04f59d8b9308a29a718513a6 255287: f26ce8748d0164ff5cc169c8ce7381cd27630267 v: v3 --- [refs] | 2 +- trunk/arch/x86/lguest/boot.c | 2 +- trunk/arch/x86/lguest/i386_head.S | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8c9617d04ba8..9f1456db2544 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f54288def3f92b7805eb6d4b1ddcd73ecf6e889 +refs/heads/master: 64be11583bac5ca65d017a5c4288f10b2bcf1928 diff --git a/trunk/arch/x86/lguest/boot.c b/trunk/arch/x86/lguest/boot.c index 74279907bc1a..5c4f240289b4 100644 --- a/trunk/arch/x86/lguest/boot.c +++ b/trunk/arch/x86/lguest/boot.c @@ -467,7 +467,7 @@ static void lguest_cpuid(unsigned int *ax, unsigned int *bx, /* * PAE systems can mark pages as non-executable. Linux calls this the * NX bit. Intel calls it XD (eXecute Disable), AMD EVP (Enhanced - * Virus Protection). We just switch turn if off here, since we don't + * Virus Protection). We just switch it off here, since we don't * support it. */ case 0x80000001: diff --git a/trunk/arch/x86/lguest/i386_head.S b/trunk/arch/x86/lguest/i386_head.S index cfa23e37ec5c..6ddfe4fc23c3 100644 --- a/trunk/arch/x86/lguest/i386_head.S +++ b/trunk/arch/x86/lguest/i386_head.S @@ -21,7 +21,7 @@ * assigned number), then it calls us here. * * WARNING: be very careful here! We're running at addresses equal to physical - * addesses (around 0), not above PAGE_OFFSET as most code expects + * addresses (around 0), not above PAGE_OFFSET as most code expects * (eg. 0xC0000000). Jumps are relative, so they're OK, but we can't touch any * data without remembering to subtract __PAGE_OFFSET! *