diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 11:45:54 -0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2011-02-11 11:45:54 -0200 |
| commit | 7c940c18c57e45910f7dd9a4011c4658cacba4b6 (patch) | |
| tree | d161ba063e2c959984f7a7126c3ed3be2a595d70 /arch/powerpc/kernel/cputable.c | |
| parent | d5e3d747007fdb541e57ed72e020ff0b94db3470 (diff) | |
| parent | 401b8e1317d288f28d6e1afd13271dcb08fd9869 (diff) | |
| download | op-kernel-dev-7c940c18c57e45910f7dd9a4011c4658cacba4b6.zip op-kernel-dev-7c940c18c57e45910f7dd9a4011c4658cacba4b6.tar.gz | |
Merge remote branch 'acme/perf/urgent' into perf/core
Fixups due to rename of event_t routines from event__ to perf_event__
done in perf/core.
Conflicts:
tools/perf/builtin-record.c
tools/perf/builtin-top.c
tools/perf/util/event.c
tools/perf/util/event.h
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
| -rw-r--r-- | arch/powerpc/kernel/cputable.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 8d74a24..e8e915c 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -2076,8 +2076,8 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s) * pointer on ppc64 and booke as we are running at 0 in real mode * on ppc64 and reloc_offset is always 0 on booke. */ - if (s->cpu_setup) { - s->cpu_setup(offset, s); + if (t->cpu_setup) { + t->cpu_setup(offset, t); } #endif /* CONFIG_PPC64 || CONFIG_BOOKE */ } |
