Merge branch 'x86/cleanups' into x86/urgent

Pull in some merge window leftovers.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Ingo Molnar
2016-03-17 09:44:57 +01:00
44 zmienionych plików z 52 dodań i 66 usunięć

Wyświetl plik

@@ -649,7 +649,7 @@ int intel_pmu_setup_lbr_filter(struct perf_event *event)
/*
* return the type of control flow change at address "from"
* intruction is not necessarily a branch (in case of interrupt).
* instruction is not necessarily a branch (in case of interrupt).
*
* The branch type returned also includes the priv level of the
* target of the control flow change (X86_BR_USER, X86_BR_KERNEL).