| From 7bdf1ee7e9269dd936a69d23cefeb02930711442 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 3 Jul 2009 08:44:51 -0500 |
| Subject: [PATCH] powerpc: Annotate atomic_locks |
| |
| commit 32ff9169c2f6c94c900f08217359972e2f3eb17f in tip. |
| |
| [PG: All the original raw lock conversion is upstream; just these two |
| chunks remain to be carried for RT.] |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c |
| index d069ff8..4f99a3a 100644 |
| --- a/arch/powerpc/kernel/traps.c |
| +++ b/arch/powerpc/kernel/traps.c |
| @@ -202,6 +202,11 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr) |
| addr, regs->nip, regs->link, code); |
| } |
| |
| +#ifdef CONFIG_PREEMPT_RT |
| + local_irq_enable(); |
| + preempt_check_resched(); |
| +#endif |
| + |
| memset(&info, 0, sizeof(info)); |
| info.si_signo = signr; |
| info.si_code = code; |
| diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c |
| index 2fbc680..a65f1d0 100644 |
| --- a/arch/powerpc/mm/tlb_nohash.c |
| +++ b/arch/powerpc/mm/tlb_nohash.c |
| @@ -274,7 +274,9 @@ void flush_tlb_kernel_range(unsigned long start, unsigned long end) |
| _tlbil_pid(0); |
| preempt_enable(); |
| #else |
| + preempt_disable(); |
| _tlbil_pid(0); |
| + preempt_enable(); |
| #endif |
| } |
| EXPORT_SYMBOL(flush_tlb_kernel_range); |
| -- |
| 1.7.1.1 |
| |