diff options
| author |   Josh Poimboeuf <jpoimboe@redhat.com> | 2017-10-04 10:39:05 -0500 |
|---|---|---|
| committer |   Radim Krčmář <rkrcmar@redhat.com> | 2017-10-05 15:06:30 +0200 |
| commit | f26e60167d8b5b1c67b3efd4cb5672da446bdb0e (patch) | |
| tree | 607ac1ada59e9a982c0e06ce6849a5da5a641142 /arch/x86 | |
| parent | kvm/x86: Avoid async PF preempting the kernel incorrectly (diff) | |
| download | linux-dev-f26e60167d8b5b1c67b3efd4cb5672da446bdb0e.tar.xz linux-dev-f26e60167d8b5b1c67b3efd4cb5672da446bdb0e.zip | |
x86/kvm: Move kvm_fastop_exception to .fixup section
When compiling the kernel with the '-frecord-gcc-switches' flag, objtool
complains:
arch/x86/kvm/emulate.o: warning: objtool: .GCC.command.line+0x0: special: can't find new instruction
And also the kernel fails to link.
The problem is that the 'kvm_fastop_exception' code gets placed into the
throwaway '.GCC.command.line' section instead of '.text'.
Exception fixup code is conventionally placed in the '.fixup' section,
so put it there where it belongs.
Reported-and-tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/emulate.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index a36254cbf776..d90cdc77e077 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c @@ -425,8 +425,10 @@ static int fastop(struct x86_emulate_ctxt *ctxt, void (*fop)(struct fastop *)); #op " %al \n\t" \ FOP_RET -asm(".global kvm_fastop_exception \n" - "kvm_fastop_exception: xor %esi, %esi; ret"); +asm(".pushsection .fixup, \"ax\"\n" + ".global kvm_fastop_exception \n" + "kvm_fastop_exception: xor %esi, %esi; ret\n" + ".popsection"); FOP_START(setcc) FOP_SETCC(seto) |