diff options
| author | Anton Blanchard <anton@samba.org> | 2009-10-18 01:24:29 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-10-28 16:13:05 +1100 |
| commit | 917e407c762ba6d91d1a4bc1c804d518585082a3 (patch) | |
| tree | 6549effd49f0569c20d8539cfb8ec6ec03409f01 /arch | |
| parent | 3cd980dbc1050889acca7306cbcedf79a4ba2f81 (diff) | |
| download | op-kernel-dev-917e407c762ba6d91d1a4bc1c804d518585082a3.zip op-kernel-dev-917e407c762ba6d91d1a4bc1c804d518585082a3.tar.gz | |
powerpc: perf_event: Hide iseries_check_pending_irqs
If CONFIG_PPC_ISERIES isn't defined we end up with
iseries_check_pending_irqs and do_work at the same address.
perf ends up picking iseries_check_pending_irqs which creates
confusing backtraces. Hide it.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 900e0ee..e722226 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -551,7 +551,7 @@ restore: BEGIN_FW_FTR_SECTION ld r5,SOFTE(r1) FW_FTR_SECTION_ELSE - b iseries_check_pending_irqs + b .Liseries_check_pending_irqs ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES) 2: TRACE_AND_RESTORE_IRQ(r5); @@ -623,7 +623,7 @@ ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_ISERIES) #endif /* CONFIG_PPC_BOOK3E */ -iseries_check_pending_irqs: +.Liseries_check_pending_irqs: #ifdef CONFIG_PPC_ISERIES ld r5,SOFTE(r1) cmpdi 0,r5,0 |
