summaryrefslogtreecommitdiff
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorYan, Zheng <zheng.z.yan@intel.com>2013-06-05 08:30:25 (GMT)
committerIngo Molnar <mingo@kernel.org>2013-06-19 11:04:55 (GMT)
commitb2fa344d0c275ea4436bfc3a97708f2c938ac0eb (patch)
tree6e41140992e56cc9003788ea33d22f1b0b946145 /arch/x86/kernel
parent7be6296fdd75f716f7348251433ea68c4b362cf3 (diff)
downloadlinux-fsl-qoriq-b2fa344d0c275ea4436bfc3a97708f2c938ac0eb.tar.xz
perf/x86/intel: Fix sparse warning
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1370421025-10986-1-git-send-email-zheng.z.yan@intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/perf_event_intel_uncore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index adabe6f..9dd9975 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -536,7 +536,7 @@ __snbep_cbox_get_constraint(struct intel_uncore_box *box, struct perf_event *eve
if (!uncore_box_is_fake(box))
reg1->alloc |= alloc;
- return 0;
+ return NULL;
fail:
for (; i >= 0; i--) {
if (alloc & (0x1 << i))