diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 18:10:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 18:10:36 -0800 |
| commit | 6e3eed9850064e38a98851ff91534bb32438b292 (patch) | |
| tree | f7311219b84f7073255c6f8255946c6fbe693e52 /arch | |
| parent | ceb5eb0cb3fe61d488aa76aba748409775a56daa (diff) | |
| parent | 05dfdbbd678ea2b642db73f48b75667a23d15484 (diff) | |
| download | linux-3.10-6e3eed9850064e38a98851ff91534bb32438b292.tar.gz linux-3.10-6e3eed9850064e38a98851ff91534bb32438b292.tar.bz2 linux-3.10-6e3eed9850064e38a98851ff91534bb32438b292.zip | |
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 a memory leak with the lg object during launcher close
lguest: disable the FORTIFY for lguest.
lguest: typos fix
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/lguest/boot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index a7ed208f81e..92f1c6f3e19 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c @@ -931,7 +931,7 @@ static void lguest_restart(char *reason) * that we can fit comfortably. * * First we need assembly templates of each of the patchable Guest operations, - * and these are in lguest_asm.S. */ + * and these are in i386_head.S. */ /*G:060 We construct a table from the assembler templates: */ static const struct lguest_insns @@ -1093,7 +1093,7 @@ __init void lguest_init(void) acpi_ht = 0; #endif - /* We set the perferred console to "hvc". This is the "hypervisor + /* We set the preferred console to "hvc". This is the "hypervisor * virtual console" driver written by the PowerPC people, which we also * adapted for lguest's use. */ add_preferred_console("hvc", 0, NULL); |