Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da758dde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perfcounters-fixes-for-linus' of... 

Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf_counter: Fix double list iteration in per task precise stats
  perf: Auto-detect libelf
  perf symbol: Fix symbol parsing in certain cases: use the build-id as a symlink
  perf_counter/powerpc: Check oprofile_cpu_type for NULL before using it
  ftrace: Fix perf-tracepoint OOPS
  perf report: Add missing command line options to man page
  perf: Auto-detect libbfd
  perf report: Make --sort comm,dso,symbol the default
parents 389623fe 1054598c

arch/powerpc/kernel/mpc7450-pmu.c

+2 −1
Original line number Diff line number Diff line
@@ -407,7 +407,8 @@ struct power_pmu mpc7450_pmu = { 


static int init_mpc7450_pmu(void)

{

	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))

	if (!cur_cpu_spec->oprofile_cpu_type ||

	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/7450"))

		return -ENODEV;



	return register_power_pmu(&mpc7450_pmu);

arch/powerpc/kernel/power4-pmu.c

+2 −1
Original line number Diff line number Diff line
@@ -606,7 +606,8 @@ static struct power_pmu power4_pmu = { 


static int init_power4_pmu(void)

{

	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4"))

	if (!cur_cpu_spec->oprofile_cpu_type ||

	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power4"))

		return -ENODEV;



	return register_power_pmu(&power4_pmu);

arch/powerpc/kernel/power5+-pmu.c

+3 −2
Original line number Diff line number Diff line
@@ -678,8 +678,9 @@ static struct power_pmu power5p_pmu = { 


static int init_power5p_pmu(void)

{

	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")

	    && strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5++"))

	if (!cur_cpu_spec->oprofile_cpu_type ||

	    (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5+")

	     && strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5++")))

		return -ENODEV;



	return register_power_pmu(&power5p_pmu);

arch/powerpc/kernel/power5-pmu.c

+2 −1
Original line number Diff line number Diff line
@@ -618,7 +618,8 @@ static struct power_pmu power5_pmu = { 


static int init_power5_pmu(void)

{

	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5"))

	if (!cur_cpu_spec->oprofile_cpu_type ||

	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power5"))

		return -ENODEV;



	return register_power_pmu(&power5_pmu);

arch/powerpc/kernel/power6-pmu.c

+2 −1
Original line number Diff line number Diff line
@@ -537,7 +537,8 @@ static struct power_pmu power6_pmu = { 


static int init_power6_pmu(void)

{

	if (strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6"))

	if (!cur_cpu_spec->oprofile_cpu_type ||

	    strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc64/power6"))

		return -ENODEV;



	return register_power_pmu(&power6_pmu);