[PATCH] Use .fixup instead of .text.fixup on __kvm_handle_fault_on_reboot

[PATCH] Use .fixup instead of .text.fixup on __kvm_handle_fault_on_reboot

[Eduardo Habkost]

[oops. sent it to the old kvm-devel list. sending to the right list, now]

vmlinux.lds expects the fixup code to be on a section named .fixup. The
.text.fixup section is not mentioned on vmlinux.lds, and is included on
the resulting vmlinux (just after .text) only because of ld heuristics on
placing orphan sections.

However, placing .text.fixup outside .text breaks the definition of
_etext, making it exclude the .text.fixup contents. That makes .text.fixup
be ignored by the kernel initialization code that needs to know about
section locations, such as the code setting page protection bits.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 include/asm-x86/kvm_host.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h
index 1e28880..982b6b2 100644
--- a/include/asm-x86/kvm_host.h
+++ b/include/asm-x86/kvm_host.h
@@ -743,7 +743,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void);
 
 #define __kvm_handle_fault_on_reboot(insn) \
 	"666: " insn "\n\t" \
-	".pushsection .text.fixup, \"ax\" \n" \
+	".pushsection .fixup, \"ax\" \n" \
 	"667: \n\t" \
 	__ASM_SIZE(push) " $666b \n\t"	      \
 	"jmp kvm_handle_fault_on_reboot \n\t" \
-- 
1.5.5.GIT

-- 
Eduardo

Re: [PATCH] Use .fixup instead of .text.fixup on __kvm_handle_fault_on_reboot

[Avi Kivity]

Eduardo Habkost wrote:
> [oops. sent it to the old kvm-devel list. sending to the right list, now]
>
> vmlinux.lds expects the fixup code to be on a section named .fixup. The
> .text.fixup section is not mentioned on vmlinux.lds, and is included on
> the resulting vmlinux (just after .text) only because of ld heuristics on
> placing orphan sections.
>
> However, placing .text.fixup outside .text breaks the definition of
> _etext, making it exclude the .text.fixup contents. That makes .text.fixup
> be ignored by the kernel initialization code that needs to know about
> section locations, such as the code setting page protection bits.
>
>   

Applied, thanks.


-- 
error compiling committee.c: too many arguments to function