From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 31 Jul 2015 08:23:35 +0000 (+0200)
Subject: Merge branch 'x86/urgent' into x86/asm, before applying dependent patches
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5b929bd11df23922daf1be5d52731cc3900c1d79;p=linux-beck.git

Merge branch 'x86/urgent' into x86/asm, before applying dependent patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

5b929bd11df23922daf1be5d52731cc3900c1d79
diff --cc arch/x86/kernel/cpu/perf_event.c
index 641413d68a54,9469dfa55607..09f9ff271df4
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@@ -2190,13 -2194,13 +2194,13 @@@ static unsigned long get_segment_base(u
  		if (idx > GDT_ENTRIES)
  			return 0;
  
- 		desc = raw_cpu_ptr(gdt_page.gdt);
+ 		desc = raw_cpu_ptr(gdt_page.gdt) + idx;
  	}
  
- 	return get_desc_base(desc + idx);
+ 	return get_desc_base(desc);
  }
  
 -#ifdef CONFIG_COMPAT
 +#ifdef CONFIG_IA32_EMULATION
  
  #include <asm/compat.h>