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

Commit 6e1b97d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  x86: Dump filtering supports x86_64 sparsemem
  x86: fix compiler warnings in arch/x86/kernel/early-quirks.c
  x86: fix !SMP compiler warning in arch/x86/kernel/acpi/processor.c
  x86: Fix boot protocol KEEP_SEGMENTS check.
  x86: voyager: fix bogus conversion to per_cpu for boot_cpu_info
  x86: export smp_ops to allow modular build of KVM
  Revert "i386: export i386 smp_call_function_mask() to modules"
parents 36ea96a4 69243f91

arch/x86/boot/compressed/head_32.S

+4 −8
Original line number Diff line number Diff line
@@ -33,24 +33,20 @@ 
	.globl startup_32



startup_32:

	/* check to see if KEEP_SEGMENTS flag is meaningful */

	cmpw $0x207, BP_version(%esi)

	jb 1f



	cld

	/* test KEEP_SEGMENTS flag to see if the bootloader is asking

	 * us to not reload segments */

	testb $(1<<6), BP_loadflags(%esi)

	jnz 2f

	jnz 1f



1:	cli

	cli

	movl $(__BOOT_DS),%eax

	movl %eax,%ds

	movl %eax,%es

	movl %eax,%fs

	movl %eax,%gs

	movl %eax,%ss



2:	cld

1:



/* Calculate the delta between where we were compiled to run

 * at and where we were actually loaded at.  This can only be done

arch/x86/boot/compressed/head_64.S

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/msr.h>

#include <asm/asm-offsets.h>



.section ".text.head"

	.code32
@@ -36,11 +37,17 @@ 


startup_32:

	cld

	/* test KEEP_SEGMENTS flag to see if the bootloader is asking

	 * us to not reload segments */

	testb $(1<<6), BP_loadflags(%esi)

	jnz 1f



	cli

	movl	$(__KERNEL_DS), %eax

	movl	%eax, %ds

	movl	%eax, %es

	movl	%eax, %ss

1:



/* Calculate the delta between where we were compiled to run

 * at and where we were actually loaded at.  This can only be done

arch/x86/kernel/acpi/processor.c

+1 −2
Original line number Diff line number Diff line
@@ -62,8 +62,7 @@ static void init_intel_pdc(struct acpi_processor *pr, struct cpuinfo_x86 *c) 
/* Initialize _PDC data based on the CPU vendor */

void arch_acpi_processor_init_pdc(struct acpi_processor *pr)

{

	unsigned int cpu = pr->id;

	struct cpuinfo_x86 *c = &cpu_data(cpu);

	struct cpuinfo_x86 *c = &cpu_data(pr->id);



	pr->pdc = NULL;

	if (c->x86_vendor == X86_VENDOR_INTEL)

arch/x86/kernel/asm-offsets_64.c

+10 −0
Original line number Diff line number Diff line
@@ -15,12 +15,16 @@ 
#include <asm/segment.h>

#include <asm/thread_info.h>

#include <asm/ia32.h>

#include <asm/bootparam.h>



#define DEFINE(sym, val) \

        asm volatile("\n->" #sym " %0 " #val : : "i" (val))



#define BLANK() asm volatile("\n->" : : )



#define OFFSET(sym, str, mem) \

	DEFINE(sym, offsetof(struct str, mem))



#define __NO_STUBS 1

#undef __SYSCALL

#undef _ASM_X86_64_UNISTD_H_
@@ -109,5 +113,11 @@ int main(void) 
	DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));

	BLANK();

	DEFINE(__NR_syscall_max, sizeof(syscalls) - 1);



	BLANK();

	OFFSET(BP_scratch, boot_params, scratch);

	OFFSET(BP_loadflags, boot_params, hdr.loadflags);

	OFFSET(BP_hardware_subarch, boot_params, hdr.hardware_subarch);

	OFFSET(BP_version, boot_params, hdr.version);

	return 0;

}

arch/x86/kernel/early-quirks.c

+3 −1
Original line number Diff line number Diff line
@@ -35,12 +35,14 @@ static void __init via_bugs(void) 
}



#ifdef CONFIG_ACPI

#ifdef CONFIG_X86_IO_APIC



static int __init nvidia_hpet_check(struct acpi_table_header *header)

{

	return 0;

}

#endif

#endif /* CONFIG_X86_IO_APIC */

#endif /* CONFIG_ACPI */



static void __init nvidia_bugs(void)

{