Move source tree closer to the 2.6.32.17 mainline
/arch/powerpc/kernel/entry_64.S
blob:9763267e38b46cbcdb2d6c9bfffd83d61b1eeb08 -> blob:917cebc2f262b2cd2b3d1f125759611cefd5d7ae
--- arch/powerpc/kernel/entry_64.S
+++ arch/powerpc/kernel/entry_64.S
@@ -556,15 +556,6 @@ ALT_FW_FTR_SECTION_END_IFCLR(FW_FEATURE_
2:
TRACE_AND_RESTORE_IRQ(r5);
-#ifdef CONFIG_PERF_EVENTS
- /* check paca->perf_event_pending if we're enabling ints */
- lbz r3,PACAPERFPEND(r13)
- and. r3,r3,r5
- beq 27f
- bl .perf_event_do_pending
-27:
-#endif /* CONFIG_PERF_EVENTS */
-
/* extract EE bit and use it to restore paca->hard_enabled */
ld r3,_MSR(r1)
rldicl r4,r3,49,63 /* r0 = (r3 >> 15) & 1 */