diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-23 12:35:55 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-09-23 12:35:55 +0300 |
| commit | 5804c19b80bf625c6a9925317f845e497434d6d3 (patch) | |
| tree | ba4a0bf9cac721e2bf898e3be5ab64773da5a9d2 /include/linux/instruction_pointer.h | |
| parent | 916e3e5f26abc165437950daff370c0693572ef4 (diff) | |
| parent | 071ef070ca77e6dfe33fd78afa293e83422f0411 (diff) | |
| download | linux-5804c19b80bf625c6a9925317f845e497434d6d3.tar.xz | |
Merge tag 'kvm-riscv-fixes-6.6-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv fixes for 6.6, take #1
- Fix KVM_GET_REG_LIST API for ISA_EXT registers
- Fix reading ISA_EXT register of a missing extension
- Fix ISA_EXT register handling in get-reg-list test
- Fix filtering of AIA registers in get-reg-list test
Diffstat (limited to 'include/linux/instruction_pointer.h')
| -rw-r--r-- | include/linux/instruction_pointer.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/instruction_pointer.h b/include/linux/instruction_pointer.h index cda1f706eaeb..aa0b3ffea935 100644 --- a/include/linux/instruction_pointer.h +++ b/include/linux/instruction_pointer.h @@ -2,7 +2,12 @@ #ifndef _LINUX_INSTRUCTION_POINTER_H #define _LINUX_INSTRUCTION_POINTER_H +#include <asm/linkage.h> + #define _RET_IP_ (unsigned long)__builtin_return_address(0) + +#ifndef _THIS_IP_ #define _THIS_IP_ ({ __label__ __here; __here: (unsigned long)&&__here; }) +#endif #endif /* _LINUX_INSTRUCTION_POINTER_H */ |