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

Commit 3d14bdad 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: (36 commits)
  x86: fix section mismatch warnings in mcheck/mce_amd_64.c
  x86: offer frame pointers in all build modes
  x86: remove duplicated #include's
  x86: k8 numa register active regions later
  x86: update Alan Cox's email addresses
  x86: rename all fields of mpc_table mpc_X to X
  x86: rename all fields of mpc_oemtable oem_X to X
  x86: rename all fields of mpc_bus mpc_X to X
  x86: rename all fields of mpc_cpu mpc_X to X
  x86: rename all fields of mpc_intsrc mpc_X to X
  x86: rename all fields of mpc_lintsrc mpc_X to X
  x86: rename all fields of mpc_iopic mpc_X to X
  x86: irqinit_64.c init_ISA_irqs should be static
  Documentation/x86/boot.txt: payload length was changed to payload_length
  x86: setup_percpu.c fix style problems
  x86: irqinit_64.c fix style problems
  x86: irqinit_32.c fix style problems
  x86: i8259.c fix style problems
  x86: irq_32.c fix style problems
  x86: ioport.c fix style problems
  ...
parents 4e9b1c18 51d7a139

Documentation/x86/boot.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ Protocol 2.07: (Kernel 2.6.24) Added paravirtualised boot protocol. 
		and KEEP_SEGMENTS flag in load_flags.

		and KEEP_SEGMENTS flag in load_flags.





Protocol 2.08:	(Kernel 2.6.26) Added crc32 checksum and ELF format

Protocol 2.08:	(Kernel 2.6.26) Added crc32 checksum and ELF format

		payload. Introduced payload_offset and payload length

		payload. Introduced payload_offset and payload_length

		fields to aid in locating the payload.

		fields to aid in locating the payload.





Protocol 2.09:	(Kernel 2.6.26) Added a field of 64-bit physical

Protocol 2.09:	(Kernel 2.6.26) Added a field of 64-bit physical

arch/x86/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ config X86 
	select HAVE_IOREMAP_PROT

	select HAVE_IOREMAP_PROT

	select HAVE_KPROBES

	select HAVE_KPROBES

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_FRAME_POINTERS

	select HAVE_KRETPROBES

	select HAVE_KRETPROBES

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE

arch/x86/include/asm/es7000/mpparse.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -10,8 +10,7 @@ extern void setup_unisys(void); 




#ifndef CONFIG_X86_GENERICARCH

#ifndef CONFIG_X86_GENERICARCH

extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);

extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id);

extern int mps_oem_check(struct mp_config_table *mpc, char *oem,

extern int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid);

				char *productid);

#endif

#endif





#ifdef CONFIG_ACPI

#ifdef CONFIG_ACPI

arch/x86/include/asm/genapic_32.h

+4 −4
Original line number Original line Diff line number Diff line
@@ -15,9 +15,9 @@ 
 * Copyright 2003 Andi Kleen, SuSE Labs.

 * Copyright 2003 Andi Kleen, SuSE Labs.

 */

 */





struct mpc_config_bus;

struct mpc_bus;

struct mp_config_table;

struct mpc_table;

struct mpc_config_processor;

struct mpc_cpu;





struct genapic {

struct genapic {

	char *name;

	char *name;
@@ -51,7 +51,7 @@ struct genapic { 
	/* When one of the next two hooks returns 1 the genapic

	/* When one of the next two hooks returns 1 the genapic

	   is switched to this. Essentially they are additional probe

	   is switched to this. Essentially they are additional probe

	   functions. */

	   functions. */

	int (*mps_oem_check)(struct mp_config_table *mpc, char *oem,

	int (*mps_oem_check)(struct mpc_table *mpc, char *oem,

			     char *productid);

			     char *productid);

	int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

	int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);

arch/x86/include/asm/mach-default/mach_mpparse.h

+2 −2
Original line number Original line Diff line number Diff line 
#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H

#ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H

#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H

#define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H





static inline int mps_oem_check(struct mp_config_table *mpc, char *oem, 

static inline int

		char *productid)

mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)

{

{

	return 0;

	return 0;

}

}