diff options
| author | Jens Axboe <axboe@kernel.dk> | 2020-11-09 18:16:48 +0300 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-11-09 18:16:48 +0300 |
| commit | 88f93de1de0c4633332631eb148bc36e8e8eb28f (patch) | |
| tree | 2d31bc12c83f810dafc4e1e1c0b3eb0a24b47722 /arch/x86/events/intel/ds.c | |
| parent | 29701d69b98d0a132abd63fe2e51125f478fbc53 (diff) | |
| parent | c8d5ed67936fddbe2ae845fc80397718006322d7 (diff) | |
| download | linux-88f93de1de0c4633332631eb148bc36e8e8eb28f.tar.xz | |
Merge branch 'x86/entry' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into tif-task_work.arch
* 'x86/entry' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Wire up TIF_NOTIFY_SIGNAL
x86: Reclaim TIF_IA32 and TIF_X32
x86/mm: Convert mmu context ia32_compat into a proper flags field
x86/elf: Use e_machine to check for x32/ia32 in setup_additional_pages()
elf: Expose ELF header on arch_setup_additional_pages()
x86/elf: Use e_machine to select start_thread for x32
elf: Expose ELF header in compat_start_thread()
x86/elf: Use e_machine to choose DLINFO in compat
x86/oprofile: Avoid TIF_IA32 when checking 64bit mode
x86/compat: Simplify compat syscall userspace allocation
perf/x86: Avoid TIF_IA32 when checking 64bit mode
Diffstat (limited to 'arch/x86/events/intel/ds.c')
| -rw-r--r-- | arch/x86/events/intel/ds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index 404315df1e16..99a59f38a4e2 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -1259,7 +1259,7 @@ static int intel_pmu_pebs_fixup_ip(struct pt_regs *regs) old_to = to; #ifdef CONFIG_X86_64 - is_64bit = kernel_ip(to) || !test_thread_flag(TIF_IA32); + is_64bit = kernel_ip(to) || any_64bit_mode(regs); #endif insn_init(&insn, kaddr, size, is_64bit); insn_get_length(&insn); |