diff options
author | Ingo Molnar <mingo@kernel.org> | 2014-06-05 11:18:03 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2014-06-05 12:26:27 +0200 |
commit | c56d34064b6eb9f9cde9e35bbfe16eedf3d81f94 (patch) | |
tree | 9877ef9e1b238e14a1878f10d51ea55fbca5f619 /arch/x86/include/asm/uprobes.h | |
parent | b13fa91421213a8d1fd05086050f05e994f3b72d (diff) | |
parent | a03b1e1c372b60183b8141cdd161316429fab5ac (diff) | |
download | op-kernel-dev-c56d34064b6eb9f9cde9e35bbfe16eedf3d81f94.zip op-kernel-dev-c56d34064b6eb9f9cde9e35bbfe16eedf3d81f94.tar.gz |
Merge branch 'perf/uprobes' into perf/core
These bits from Oleg are fully cooked, ship them to Linus.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/uprobes.h')
-rw-r--r-- | arch/x86/include/asm/uprobes.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h index 93bee7b..7be3c07 100644 --- a/arch/x86/include/asm/uprobes.h +++ b/arch/x86/include/asm/uprobes.h @@ -41,18 +41,18 @@ struct arch_uprobe { u8 ixol[MAX_UINSN_BYTES]; }; - u16 fixups; const struct uprobe_xol_ops *ops; union { -#ifdef CONFIG_X86_64 - unsigned long rip_rela_target_address; -#endif struct { s32 offs; u8 ilen; u8 opc1; - } branch; + } branch; + struct { + u8 fixups; + u8 ilen; + } def; }; }; |