From 3a5aedf8bc83736b54e18ea36150774030b4291d Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 24 Sep 2007 21:24:44 -0700 Subject: [PATCH] --- yaml --- r: 65134 b: refs/heads/master c: bbbd2bf00bab467cff7b1f418b2cb24c71291f59 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/lguest/lguest_asm.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b3930ac5448a..6d757c6ad597 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fdfb870f8e34e77567043b388051df14f7d33482 +refs/heads/master: bbbd2bf00bab467cff7b1f418b2cb24c71291f59 diff --git a/trunk/drivers/lguest/lguest_asm.S b/trunk/drivers/lguest/lguest_asm.S index f182c6a36209..1ddcd5cd20f6 100644 --- a/trunk/drivers/lguest/lguest_asm.S +++ b/trunk/drivers/lguest/lguest_asm.S @@ -22,8 +22,9 @@ jmp lguest_init /*G:055 We create a macro which puts the assembler code between lgstart_ and - * lgend_ markers. These templates end up in the .init.text section, so they - * are discarded after boot. */ + * lgend_ markers. These templates are put in the .text section: they can't be + * discarded after boot as we may need to patch modules, too. */ +.text #define LGUEST_PATCH(name, insns...) \ lgstart_##name: insns; lgend_##name:; \ .globl lgstart_##name; .globl lgend_##name @@ -34,7 +35,6 @@ LGUEST_PATCH(popf, movl %eax, lguest_data+LGUEST_DATA_irq_enabled) LGUEST_PATCH(pushf, movl lguest_data+LGUEST_DATA_irq_enabled, %eax) /*:*/ -.text /* These demark the EIP range where host should never deliver interrupts. */ .global lguest_noirq_start .global lguest_noirq_end