Skip to contentSkip to conversation

x86 updates for 4.5

GIT PULL Thomas Gleixner 1 participant 1 message Feb 14, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

please pull the latest x86-urgent-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus

Two small fixlets for x86:

- Prevent a KASAN false positive in thread_saved_pc()

- Fix a 32-bit truncation problem in the x86 numa code

Thanks,

tglx

------------------>
Dmitry Vyukov (1):
x86: Fix KASAN false positives in thread_saved_pc()

Ingo Molnar (1):
x86/mm/numa: Fix 32-bit memblock range truncation bug on 32-bit NUMA kernels

 arch/x86/include/asm/processor.h | 2 +-
 arch/x86/mm/numa.c               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/include/asm/processor.h +1 -1
index 2d5a50cb61a2..20c11d1aa4cc 100644
@@ -766,7 +766,7 @@ extern unsigned long thread_saved_pc(struct task_struct *tsk);
  * Return saved PC of a blocked thread.
  * What is this good for? it will be always the scheduler or ret_from_fork.
  */
-#define thread_saved_pc(t)	(*(unsigned long *)((t)->thread.sp - 8))
+#define thread_saved_pc(t)	READ_ONCE_NOCHECK(*(unsigned long *)((t)->thread.sp - 8))
 
 #define task_pt_regs(tsk)	((struct pt_regs *)(tsk)->thread.sp0 - 1)
 extern unsigned long KSTK_ESP(struct task_struct *task);
arch/x86/mm/numa.c +1 -1
index c3b3f653ed0c..d04f8094bc23 100644
@@ -469,7 +469,7 @@ static void __init numa_clear_kernel_node_hotplug(void)
 {
 	int i, nid;
 	nodemask_t numa_kernel_nodes = NODE_MASK_NONE;
-	unsigned long start, end;
+	phys_addr_t start, end;
 	struct memblock_region *r;
 
 	/*