projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'torvalds/master' into perf/core
[linux-2.6-microblaze.git]
/
arch
/
powerpc
/
perf
/
core-book3s.c
diff --git
a/arch/powerpc/perf/core-book3s.c
b/arch/powerpc/perf/core-book3s.c
index
16d4d1b
..
5162241
100644
(file)
--- a/
arch/powerpc/perf/core-book3s.c
+++ b/
arch/powerpc/perf/core-book3s.c
@@
-2254,7
+2254,7
@@
unsigned long perf_instruction_pointer(struct pt_regs *regs)
bool use_siar = regs_use_siar(regs);
unsigned long siar = mfspr(SPRN_SIAR);
bool use_siar = regs_use_siar(regs);
unsigned long siar = mfspr(SPRN_SIAR);
- if (ppmu
->flags & PPMU_P10_DD1
) {
+ if (ppmu
&& (ppmu->flags & PPMU_P10_DD1)
) {
if (siar)
return siar;
else
if (siar)
return siar;
else