Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar: "Misc cleanups" * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/kprobes: Remove trampoline_handler() prototype x86/kernel: Fix more -Wmissing-prototypes warnings x86: Fix various typos in comments x86/headers: Fix -Wmissing-prototypes warning x86/process: Avoid unnecessary NULL check in get_wchan() x86/traps: Complete prototype declarations x86/mce: Fix -Wmissing-prototypes warnings x86/gart: Rewrite early_gart_iommu_check() comment
This commit is contained in:
@@ -589,7 +589,7 @@ static __init int bts_init(void)
|
||||
* the AUX buffer.
|
||||
*
|
||||
* However, since this driver supports per-CPU and per-task inherit
|
||||
* we cannot use the user mapping since it will not be availble
|
||||
* we cannot use the user mapping since it will not be available
|
||||
* if we're not running the owning process.
|
||||
*
|
||||
* With PTI we can't use the kernal map either, because its not
|
||||
|
@@ -1930,7 +1930,7 @@ static void intel_pmu_enable_all(int added)
|
||||
* in sequence on the same PMC or on different PMCs.
|
||||
*
|
||||
* In practise it appears some of these events do in fact count, and
|
||||
* we need to programm all 4 events.
|
||||
* we need to program all 4 events.
|
||||
*/
|
||||
static void intel_pmu_nhm_workaround(void)
|
||||
{
|
||||
|
@@ -1199,7 +1199,7 @@ static void setup_pebs_sample_data(struct perf_event *event,
|
||||
/*
|
||||
* We must however always use iregs for the unwinder to stay sane; the
|
||||
* record BP,SP,IP can point into thin air when the record is from a
|
||||
* previous PMI context or an (I)RET happend between the record and
|
||||
* previous PMI context or an (I)RET happened between the record and
|
||||
* PMI.
|
||||
*/
|
||||
if (sample_type & PERF_SAMPLE_CALLCHAIN)
|
||||
|
@@ -1259,7 +1259,7 @@ again:
|
||||
}
|
||||
/*
|
||||
* Perf does test runs to see if a whole group can be assigned
|
||||
* together succesfully. There can be multiple rounds of this.
|
||||
* together successfully. There can be multiple rounds of this.
|
||||
* Unfortunately, p4_pmu_swap_config_ts touches the hwc->config
|
||||
* bits, such that the next round of group assignments will
|
||||
* cause the above p4_should_swap_ts to pass instead of fail.
|
||||
|
Reference in New Issue
Block a user