From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 2 Aug 2010 06:29:56 +0000 (+0200)
Subject: Merge commit 'v2.6.35' into perf/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge commit 'v2.6.35' into perf/core

Conflicts:
	tools/perf/Makefile
	tools/perf/util/hist.c

Merge reason: Resolve the conflicts and update to latest upstream.

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

3772b734720e1a3f2dc1d95cfdfaa5332f4ccf01
diff --cc tools/perf/util/symbol.c
index 94cdf68440cd,5b276833e2bf..3b8c00506672
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@@ -1569,10 -1489,11 +1571,12 @@@ static int map_groups__set_modules_path
  				 dir_name, dent->d_name);
  
  			long_name = strdup(path);
- 			if (long_name == NULL)
- 				goto failure;
+ 			if (long_name == NULL) {
+ 				ret = -1;
+ 				goto out;
+ 			}
  			dso__set_long_name(map->dso, long_name);
 +			map->dso->lname_alloc = 1;
  			dso__kernel_module_get_build_id(map->dso, "");
  		}
  	}