diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2018-10-08 09:48:31 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-10-08 09:48:36 +0200 |
| commit | 188de5dd80b2b7986e75821374efb67081049b6e (patch) | |
| tree | 545bbc0fdb58f30c0175128e3b5a9c00c89e2020 /arch/x86/boot/compressed/mem_encrypt.S | |
| parent | 5207ca554bfcb5a32959eb12b6aff8f64384492c (diff) | |
| parent | abf1a08ff3237a27188ff8cc2904f2cea893af55 (diff) | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merge net-next, which pulled in net, so I can merge a few more
patches that would otherwise conflict.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/x86/boot/compressed/mem_encrypt.S')
| -rw-r--r-- | arch/x86/boot/compressed/mem_encrypt.S | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/arch/x86/boot/compressed/mem_encrypt.S b/arch/x86/boot/compressed/mem_encrypt.S index eaa843a52907..a480356e0ed8 100644 --- a/arch/x86/boot/compressed/mem_encrypt.S +++ b/arch/x86/boot/compressed/mem_encrypt.S @@ -25,20 +25,6 @@ ENTRY(get_sev_encryption_bit) push %ebx push %ecx push %edx - push %edi - - /* - * RIP-relative addressing is needed to access the encryption bit - * variable. Since we are running in 32-bit mode we need this call/pop - * sequence to get the proper relative addressing. - */ - call 1f -1: popl %edi - subl $1b, %edi - - movl enc_bit(%edi), %eax - cmpl $0, %eax - jge .Lsev_exit /* Check if running under a hypervisor */ movl $1, %eax @@ -69,15 +55,12 @@ ENTRY(get_sev_encryption_bit) movl %ebx, %eax andl $0x3f, %eax /* Return the encryption bit location */ - movl %eax, enc_bit(%edi) jmp .Lsev_exit .Lno_sev: xor %eax, %eax - movl %eax, enc_bit(%edi) .Lsev_exit: - pop %edi pop %edx pop %ecx pop %ebx @@ -113,8 +96,6 @@ ENTRY(set_sev_encryption_mask) ENDPROC(set_sev_encryption_mask) .data -enc_bit: - .int 0xffffffff #ifdef CONFIG_AMD_MEM_ENCRYPT .balign 8 |