Commit 4ef7e3e9 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: user_regset_view table fix for ia32 on 64-bit
  x86: arch/x86/mm/pat.c - fix warning
  x86: fix csum_partial() export
  x86: early_init_centaur(): use set_cpu_cap()
  x86: fix app crashes after SMP resume
  x86: wakeup.lds.S - section ordering fix
  x86: [VOYAGER] fix duplicate phys_cpu_present_map symbol
  x86/pci: fix broken ISA DMA
parents 9604006d 1f465f4e

arch/x86/kernel/acpi/realmode/wakeup.lds.S

+5 −5
Original line number Diff line number Diff line
@@ -12,11 +12,6 @@ ENTRY(_start) 


SECTIONS

{

	. = HEADER_OFFSET;

	.header : {

		 *(.header)

	}



	. = 0;

	.text : {

		 *(.text*)
@@ -50,6 +45,11 @@ SECTIONS 
		__bss_end = .;

	}



	. = HEADER_OFFSET;

	.header : {

		*(.header)

	}



	. = ALIGN(16);

	_end = .;

arch/x86/kernel/ptrace.c

+5 −2
Original line number Diff line number Diff line
@@ -1303,6 +1303,9 @@ static const struct user_regset_view user_x86_64_view = { 
#define genregs32_get		genregs_get

#define genregs32_set		genregs_set



#define user_i387_ia32_struct	user_i387_struct

#define user32_fxsr_struct	user_fxsr_struct



#endif	/* CONFIG_X86_64 */



#if defined CONFIG_X86_32 || defined CONFIG_IA32_EMULATION
@@ -1315,13 +1318,13 @@ static const struct user_regset x86_32_regsets[] = { 
	},

	[REGSET_FP] = {

		.core_note_type = NT_PRFPREG,

		.n = sizeof(struct user_i387_struct) / sizeof(u32),

		.n = sizeof(struct user_i387_ia32_struct) / sizeof(u32),

		.size = sizeof(u32), .align = sizeof(u32),

		.active = fpregs_active, .get = fpregs_get, .set = fpregs_set

	},

	[REGSET_XFP] = {

		.core_note_type = NT_PRXFPREG,

		.n = sizeof(struct user_i387_struct) / sizeof(u32),

		.n = sizeof(struct user32_fxsr_struct) / sizeof(u32),

		.size = sizeof(u32), .align = sizeof(u32),

		.active = xfpregs_active, .get = xfpregs_get, .set = xfpregs_set

	},

arch/x86/kernel/setup.c

+3 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <asm/mpspec.h>

#include <asm/apicdef.h>



#ifdef CONFIG_X86_LOCAL_APIC

unsigned int num_processors;

unsigned disabled_cpus __cpuinitdata;

/* Processor that is doing the boot up */
@@ -23,8 +24,9 @@ EXPORT_PER_CPU_SYMBOL(x86_cpu_to_apicid); 


/* Bitmask of physically existing CPUs */

physid_mask_t phys_cpu_present_map;

#endif



#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_SMP)

#if defined(CONFIG_HAVE_SETUP_PER_CPU_AREA) && defined(CONFIG_X86_SMP)

/*

 * Copy data used in early init routines from the initial arrays to the

 * per cpu data areas.  These arrays then become expendable and the

arch/x86/kernel/setup_64.c

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c) 
static void __cpuinit early_init_centaur(struct cpuinfo_x86 *c)

{

	if (c->x86 == 0x6 && c->x86_model >= 0xf)

		set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability);

		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);

}



static void __cpuinit init_centaur(struct cpuinfo_x86 *c)

arch/x86/kernel/smp.c

+2 −1
Original line number Diff line number Diff line
@@ -231,7 +231,8 @@ native_smp_call_function_mask(cpumask_t mask, 
	wmb();



	/* Send a message to other CPUs */

	if (cpus_equal(mask, allbutself))

	if (cpus_equal(mask, allbutself) &&

	    cpus_equal(cpu_online_map, cpu_callout_map))

		send_IPI_allbutself(CALL_FUNCTION_VECTOR);

	else

		send_IPI_mask(mask, CALL_FUNCTION_VECTOR);

CRA Git | Maintained and supported by SUSTech CRA and CCSE