diff --git a/kernel/kprobes.c b/kernel/kprobes.c index a7dcf06..9cdbf26 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1661,9 +1661,9 @@ static int __kprobes pre_handler_kretprobe(struct kprobe *p, ri->task = current; if (rp->entry_handler && rp->entry_handler(ri, regs)) { - spin_lock_irqsave(&rp->lock, flags); + raw_spin_lock_irqsave(&rp->lock, flags); hlist_add_head(&ri->hlist, &rp->free_instances); - spin_unlock_irqrestore(&rp->lock, flags); + raw_spin_unlock_irqrestore(&rp->lock, flags); return 0; } diff --git a/kernel/printk.c b/kernel/printk.c index 30dc7f0..60f4290 100644 --- a/kernel/printk.c +++ b/kernel/printk.c @@ -900,7 +900,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) boot_delay_msec(); printk_delay(); - preempt_disable(); + migrate_disable(); /* This stops the holder of console_sem just where we want him */ raw_local_irq_save(flags); this_cpu = smp_processor_id(); @@ -1031,7 +1031,7 @@ asmlinkage int vprintk(const char *fmt, va_list args) out_restore_irqs: raw_local_irq_restore(flags); - preempt_enable(); + migrate_enable(); return printed_len; } EXPORT_SYMBOL(printk); diff --git a/localversion-rt b/localversion-rt index 41f7b99..ac4d836 100644 --- a/localversion-rt +++ b/localversion-rt @@ -1 +1 @@ --rt43 +-rt44