From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 23 Sep 2010 06:02:09 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core
X-Git-Tag: v2.6.37-rc1~214^2~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'linus' into perf/core

Conflicts:
	arch/sparc/kernel/perf_event.c

Merge reason: Resolve the conflict.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

d0303d71c2fb9bcb90a8d48e6462c78c86f70ce6
diff --cc arch/sparc/kernel/perf_event.c
index f9a7067,6318e62..0d6deb5
--- a/arch/sparc/kernel/perf_event.c
+++ b/arch/sparc/kernel/perf_event.c
@@@ -1073,16 -1047,18 +1073,27 @@@ static int sparc_pmu_event_init(struct 
  		pmap = sparc_map_cache_event(attr->config);
  		if (IS_ERR(pmap))
  			return PTR_ERR(pmap);
 -	} else if (attr->type != PERF_TYPE_RAW)
 -		return -EOPNOTSUPP;
 +		break;
 +
 +	case PERF_TYPE_RAW:
- 		return -EOPNOTSUPP;
++		pmap = NULL;
++		break;
 +
 +	default:
 +		return -ENOENT;
 +
 +	}
  
+ 	if (pmap) {
+ 		hwc->event_base = perf_event_encode(pmap);
+ 	} else {
 -		/* User gives us "(encoding << 16) | pic_mask" for
++		/*
++		 * User gives us "(encoding << 16) | pic_mask" for
+ 		 * PERF_TYPE_RAW events.
+ 		 */
+ 		hwc->event_base = attr->config;
+ 	}
+ 
  	/* We save the enable bits in the config_base.  */
  	hwc->config_base = sparc_pmu->irq_bit;
  	if (!attr->exclude_user)