]> git.karo-electronics.de Git - linux-beck.git/commitdiff
x86/compat, x86/perf: Don't build perf_callchain_user32() on x32
authorBrian Gerst <brgerst@gmail.com>
Mon, 22 Jun 2015 11:55:17 +0000 (07:55 -0400)
committerIngo Molnar <mingo@kernel.org>
Mon, 6 Jul 2015 13:28:57 +0000 (15:28 +0200)
perf_callchain_user32() is not needed for x32.

Signed-off-by: Brian Gerst <brgerst@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1434974121-32575-9-git-send-email-brgerst@gmail.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/kernel/cpu/perf_event.c

index 3658de47900f9a921a0f8373db962e061d42db3a..641413d68a548ceda2ed90e86cd8c333d729e5f7 100644 (file)
@@ -2196,7 +2196,7 @@ static unsigned long get_segment_base(unsigned int segment)
        return get_desc_base(desc + idx);
 }
 
-#ifdef CONFIG_COMPAT
+#ifdef CONFIG_IA32_EMULATION
 
 #include <asm/compat.h>