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

Commit 8326e284 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

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

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, delay: tsc based udelay should have rdtsc_barrier
  x86, setup: correct include file in <asm/boot.h>
  x86, setup: Fix typo "CONFIG_x86_64" in <asm/boot.h>
  x86, mce: percpu mcheck_timer should be pinned
  x86: Add sysctl to allow panic on IOCK NMI error
  x86: Fix uv bau sending buffer initialization
  x86, mce: Fix mce resume on 32bit
  x86: Move init_gbpages() to setup_arch()
  x86: ensure percpu lpage doesn't consume too much vmalloc space
  x86: implement percpu_alloc kernel parameter
  x86: fix pageattr handling for lpage percpu allocator and re-enable it
  x86: reorganize cpa_process_alias()
  x86: prepare setup_pcpu_lpage() for pageattr fix
  x86: rename remap percpu first chunk allocator to lpage
  x86: fix duplicate free in setup_pcpu_remap() failure path
  percpu: fix too lazy vunmap cache flushing
  x86: Set cpu_llc_id on AMD CPUs
parents 187dd317 e888d7fa

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1915,6 +1915,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			Format: { 0 | 1 }

			See arch/parisc/kernel/pdc_chassis.c



	percpu_alloc=	[X86] Select which percpu first chunk allocator to use.

			Allowed values are one of "lpage", "embed" and "4k".

			See comments in arch/x86/kernel/setup_percpu.c for

			details on each allocator.  This parameter is primarily

			for debugging and performance comparison.



	pf.		[PARIDE]

			See Documentation/blockdev/paride.txt.

arch/x86/include/asm/boot.h

+3 −3
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#ifdef __KERNEL__



#include <asm/page_types.h>

#include <asm/pgtable_types.h>



/* Physical address where kernel should be loaded. */

#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \
@@ -16,10 +16,10 @@ 
				& ~(CONFIG_PHYSICAL_ALIGN - 1))



/* Minimum kernel alignment, as a power of two */

#ifdef CONFIG_x86_64

#ifdef CONFIG_X86_64

#define MIN_KERNEL_ALIGN_LG2	PMD_SHIFT

#else

#define MIN_KERNEL_ALIGN_LG2	(PAGE_SHIFT+1)

#define MIN_KERNEL_ALIGN_LG2	(PAGE_SHIFT + THREAD_ORDER)

#endif

#define MIN_KERNEL_ALIGN	(_AC(1, UL) << MIN_KERNEL_ALIGN_LG2)

arch/x86/include/asm/percpu.h

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 


#else /* ...!ASSEMBLY */



#include <linux/kernel.h>

#include <linux/stringify.h>



#ifdef CONFIG_SMP
@@ -155,6 +156,15 @@ do { \ 
/* We can use this directly for local CPU (faster). */

DECLARE_PER_CPU(unsigned long, this_cpu_off);



#ifdef CONFIG_NEED_MULTIPLE_NODES

void *pcpu_lpage_remapped(void *kaddr);

#else

static inline void *pcpu_lpage_remapped(void *kaddr)

{

	return NULL;

}

#endif



#endif /* !__ASSEMBLY__ */



#ifdef CONFIG_SMP

arch/x86/kernel/cpu/amd.c

+3 −1
Original line number Diff line number Diff line
@@ -258,13 +258,15 @@ static void __cpuinit amd_detect_cmp(struct cpuinfo_x86 *c) 
{

#ifdef CONFIG_X86_HT

	unsigned bits;

	int cpu = smp_processor_id();



	bits = c->x86_coreid_bits;



	/* Low order bits define the core id (index of core in socket) */

	c->cpu_core_id = c->initial_apicid & ((1 << bits)-1);

	/* Convert the initial APIC ID into the socket ID */

	c->phys_proc_id = c->initial_apicid >> bits;

	/* use socket ID also for last level cache */

	per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;

#endif

}

arch/x86/kernel/cpu/mcheck/mce.c

+2 −2
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ static void mcheck_timer(unsigned long data) 
		*n = min(*n*2, (int)round_jiffies_relative(check_interval*HZ));



	t->expires = jiffies + *n;

	add_timer(t);

	add_timer_on(t, smp_processor_id());

}



static void mce_do_trigger(struct work_struct *work)
@@ -1321,7 +1321,7 @@ static void mce_init_timer(void) 
		return;

	setup_timer(t, mcheck_timer, smp_processor_id());

	t->expires = round_jiffies(jiffies + *n);

	add_timer(t);

	add_timer_on(t, smp_processor_id());

}



/*