From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 4 Nov 2009 10:54:15 +0000 (+0100)
Subject: Merge commit 'v2.6.32-rc6' into perf/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a2e71271535fde493c32803b1f34789f97efcb5e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge commit 'v2.6.32-rc6' into perf/core

Conflicts:
	tools/perf/Makefile

Merge reason: Resolve the conflict, merge to upstream and merge in
              perf fixes so we can add a dependent patch.

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

a2e71271535fde493c32803b1f34789f97efcb5e
diff --cc tools/perf/util/symbol.c
index 93c49f4685ff,226f44a2357d..ac94d7b94f61
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@@ -671,11 -531,13 +671,11 @@@ static int dso__load_sym(struct dso *se
  	GElf_Sym sym;
  	Elf_Scn *sec, *sec_strndx;
  	Elf *elf;
 -	int nr = 0, kernel = !strcmp("[kernel]", self->name);
 +	int nr = 0;
  
- 	elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
+ 	elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
  	if (elf == NULL) {
 -		if (v)
 -			fprintf(stderr, "%s: cannot read %s ELF file.\n",
 -				__func__, name);
 +		pr_err("%s: cannot read %s ELF file.\n", __func__, name);
  		goto out_close;
  	}
  
@@@ -842,10 -675,11 +842,10 @@@ static char *dso__read_build_id(struct 
  	if (fd < 0)
  		goto out;
  
- 	elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
+ 	elf = elf_begin(fd, PERF_ELF_C_READ_MMAP, NULL);
  	if (elf == NULL) {
 -		if (v)
 -			fprintf(stderr, "%s: cannot read %s ELF file.\n",
 -				__func__, self->name);
 +		pr_err("%s: cannot read %s ELF file.\n", __func__,
 +		       self->long_name);
  		goto out_close;
  	}