diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-24 20:08:26 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-24 20:08:26 (GMT) |
| commit | db8862eafe8a5d030a3b02e81b8bb47447c315e3 (patch) | |
| tree | 073ea7b46809bf804134cbf008a593413c02a99c /arch/x86/Kconfig.cpu | |
| parent | c5dee6177f4bd2095aab7d9be9f6ebdddd6deee9 (diff) | |
| parent | c20137fc5329eaf24093fc48c52608dc66be8e5c (diff) | |
| download | linux-fsl-qoriq-db8862eafe8a5d030a3b02e81b8bb47447c315e3.tar.xz | |
Merge branch 'linus' into tracing/hw-branch-tracing
Diffstat (limited to 'arch/x86/Kconfig.cpu')
| -rw-r--r-- | arch/x86/Kconfig.cpu | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 85a7857..b54903e 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu @@ -521,6 +521,7 @@ config X86_PTRACE_BTS bool "Branch Trace Store" default y depends on X86_DEBUGCTLMSR + depends on BROKEN help This adds a ptrace interface to the hardware's branch trace store. |