Pull perf fixes from Ingo Molnar: "This tree includes four core perf fixes for misc bugs, three fixes to x86 PMU drivers, and two updates to old email addresses" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf: Do not send exit event twice perf/x86/intel: Fix INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_NA macro perf/x86/intel: Make L1D_PEND_MISS.FB_FULL not constrained on Haswell perf: Fix PERF_EVENT_IOC_PERIOD deadlock treewide: Remove old email address perf/x86: Fix LBR call stack save/restore perf: Update email address in MAINTAINERS perf/core: Robustify the perf_cgroup_from_task() RCU checks perf/core: Fix RCU problem with cgroup context switching code
Showing the changes to include/linux (5 of 31 files). Show all
Unified · Split
| @@ -5,7 +5,7 @@ · 4 unmodified lines | ||
| 5 | 5 | * Jump label support |
| 6 | 6 | * |
| 7 | 7 | * Copyright (C) 2009-2012 Jason Baron <jbaron@redhat.com> |
| 8 | − * Copyright (C) 2011-2012 Peter Zijlstra <pzijlstr@redhat.com> | |
| 8 | + * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra | |
| 9 | 9 | * |
| 10 | 10 | * DEPRECATED API: |
| 11 | 11 | * |
| @@ -2,7 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | * Runtime locking correctness validator |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2006,2007 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> |
| 5 | − * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com> | |
| 5 | + * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra | |
| 6 | 6 | * |
| 7 | 7 | * see Documentation/locking/lockdep-design.txt for more details. |
| 8 | 8 | */ |
| @@ -697,9 +697,11 @@ struct perf_cgroup { · 696 unmodified lines | ||
| 697 | 697 | * if there is no cgroup event for the current CPU context. |
| 698 | 698 | */ |
| 699 | 699 | static inline struct perf_cgroup * |
| 700 | −perf_cgroup_from_task(struct task_struct *task) | |
| 700 | +perf_cgroup_from_task(struct task_struct *task, struct perf_event_context *ctx) | |
| 701 | 701 | { |
| 702 | − return container_of(task_css(task, perf_event_cgrp_id), | |
| 702 | + return container_of(task_css_check(task, perf_event_cgrp_id, | |
| 703 | + ctx ? lockdep_is_held(&ctx->lock) | |
| 704 | + : true), | |
| 703 | 705 | struct perf_cgroup, css); |
| 704 | 706 | } |
| 705 | 707 | #endif /* CONFIG_CGROUP_PERF */ |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | /* |
| 2 | 2 | * FLoating proportions |
| 3 | 3 | * |
| 4 | − * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com> | |
| 4 | + * Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra | |
| 5 | 5 | * |
| 6 | 6 | * This file contains the public data structure and API definitions. |
| 7 | 7 | */ |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | * Authors: |
| 22 | 22 | * Srikar Dronamraju |
| 23 | 23 | * Jim Keniston |
| 24 | − * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra <pzijlstr@redhat.com> | |
| 24 | + * Copyright (C) 2011-2012 Red Hat, Inc., Peter Zijlstra | |
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | #include <linux/errno.h> |