Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c83119a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar.

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/smp: Fix topology checks on AMD MCM CPUs
  x86/mm: Fix some kernel-doc warnings
  x86, um: Correct syscall table type attributes breaking gcc 4.8
parents ed21a66c 161270fc

arch/x86/kernel/smpboot.c

+5 −2
Original line number Diff line number Diff line
@@ -349,9 +349,12 @@ static bool __cpuinit match_llc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o) 


static bool __cpuinit match_mc(struct cpuinfo_x86 *c, struct cpuinfo_x86 *o)

{

	if (c->phys_proc_id == o->phys_proc_id)

		return topology_sane(c, o, "mc");

	if (c->phys_proc_id == o->phys_proc_id) {

		if (cpu_has(c, X86_FEATURE_AMD_DCM))

			return true;



		return topology_sane(c, o, "mc");

	}

	return false;

}

arch/x86/mm/ioremap.c

+2 −2
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void __iomem *__ioremap_caller(resource_size_t phys_addr, 


/**

 * ioremap_nocache     -   map bus memory into CPU space

 * @offset:    bus address of the memory

 * @phys_addr:    bus address of the memory

 * @size:      size of the resource to map

 *

 * ioremap_nocache performs a platform specific sequence of operations to
@@ -217,7 +217,7 @@ EXPORT_SYMBOL(ioremap_nocache); 


/**

 * ioremap_wc	-	map memory into CPU space write combined

 * @offset:	bus address of the memory

 * @phys_addr:	bus address of the memory

 * @size:	size of the resource to map

 *

 * This version of ioremap ensures that the memory is marked write combining.

arch/x86/mm/pageattr.c

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ within(unsigned long addr, unsigned long start, unsigned long end) 


/**

 * clflush_cache_range - flush a cache range with clflush

 * @addr:	virtual start address

 * @vaddr:	virtual start address

 * @size:	number of bytes to flush

 *

 * clflush is an unordered instruction which needs fencing with mfence

arch/x86/um/sys_call_table_32.c

+2 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#undef __SYSCALL_I386

#define __SYSCALL_I386(nr, sym, compat) [ nr ] = sym,



typedef void (*sys_call_ptr_t)(void);

typedef asmlinkage void (*sys_call_ptr_t)(void);



extern void sys_ni_syscall(void);

extern asmlinkage void sys_ni_syscall(void);



const sys_call_ptr_t sys_call_table[] __cacheline_aligned = {

	/*