Merge commit '1b93c9c0d8b9' into kernel

Conflicts:
	src/modules/buffer/buffer.c
	src/modules/kprobe/arch/asm-arm/dbi_kprobes.c
	src/modules/kprobe/arch/asm-arm/dbi_kprobes.h

diff --cc kprobe/dbi_kprobes.c
index 6d1435c,bef0ffa..644657b
--- 1/kprobe/dbi_kprobes.c
--- 2/kprobe/dbi_kprobes.c
+++ b/kprobe/dbi_kprobes.c
@@@ -904,13 -858,14 +904,14 @@@ static int dbi_disarm_krp_inst(struct k
                unsigned long pc = arch_get_task_pc(ri->task);
  
                printk("---> [%d] %s (%d/%d): pc = %08lx, ra = %08lx, tramp= %08lx (%08lx)\n",
-                               task_cpu(ri->task),
-                               ri->task->comm, ri->task->tgid, ri->task->pid,
-                               pc, ri->ret_addr, tramp,
-                               ri->rp ? ri->rp->kp.addr: NULL);
+                      task_cpu(ri->task),
+                      ri->task->comm, ri->task->tgid, ri->task->pid,
+                      pc, (long unsigned int)ri->ret_addr,
+                      (long unsigned int)tramp,
+                      (long unsigned int)(ri->rp ? ri->rp->kp.addr: NULL));
  
                /* __switch_to retprobe handling */
-               if (pc == tramp) {
 -              if (pc == (unsigned long) tramp) {
++              if (pc == (unsigned long)tramp) {
                        rm_task_trampoline(ri->task, ri);
                        return 0;
                }