Merge branch 'linus' into perfcounters/core-v2

Merge reason: we have gathered quite a few conflicts, need to merge upstream

Conflicts:
	arch/powerpc/kernel/Makefile
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/hardirq.h
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h
	arch/x86/kernel/cpu/common.c
	arch/x86/kernel/irq.c
	arch/x86/kernel/syscall_table_32.S
	arch/x86/mm/iomap_32.c
	include/linux/sched.h
	kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
index 74bde13224c9..b02a3f1d46a0 100644
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
@@ -24,8 +24,8 @@
 # define trace_softirqs_enabled(p)      ((p)->softirqs_enabled)
 # define trace_hardirq_enter()  do { current->hardirq_context++; } while (0)
 # define trace_hardirq_exit()   do { current->hardirq_context--; } while (0)
-# define trace_softirq_enter()  do { current->softirq_context++; } while (0)
-# define trace_softirq_exit()   do { current->softirq_context--; } while (0)
+# define lockdep_softirq_enter()        do { current->softirq_context++; } while (0)
+# define lockdep_softirq_exit() do { current->softirq_context--; } while (0)
 # define INIT_TRACE_IRQFLAGS    .softirqs_enabled = 1,
 #else
 # define trace_hardirqs_on()            do { } while (0)
@@ -38,8 +38,8 @@
 # define trace_softirqs_enabled(p)      0
 # define trace_hardirq_enter()          do { } while (0)
 # define trace_hardirq_exit()           do { } while (0)
-# define trace_softirq_enter()          do { } while (0)
-# define trace_softirq_exit()           do { } while (0)
+# define lockdep_softirq_enter()        do { } while (0)
+# define lockdep_softirq_exit()         do { } while (0)
 # define INIT_TRACE_IRQFLAGS
 #endif