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

Commit a7f5aaf3 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: fix build warnings in real mode code
  x86, calgary: fix section mismatch warning - get_tce_space_from_tar
  x86: silence section mismatch warning - get_local_pda
  x86, percpu: silence section mismatch warnings related to EARLY_PER_CPU variables
  x86: fix i486 suspend to disk CR4 oops
  x86: mpparse.c: fix section mismatch warning
  x86: mmconf: fix section mismatch warning
  x86: fix MP_processor_info section mismatch warning
  x86, tsc: fix section mismatch warning
  x86: correct register constraints for 64-bit atomic operations
parents bba59525 1b72691c

arch/x86/boot/boot.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
/* Useful macros */

#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))



#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))



extern struct setup_header hdr;

extern struct boot_params boot_params;

arch/x86/boot/memory.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
 */



#include "boot.h"

#include <linux/kernel.h>



#define SMAP	0x534d4150	/* ASCII "SMAP" */

arch/x86/kernel/acpi/sleep.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ int acpi_save_state_mem(void) 
#endif /* !CONFIG_64BIT */



	header->pmode_cr0 = read_cr0();

	header->pmode_cr4 = read_cr4();

	header->pmode_cr4 = read_cr4_safe();

	header->realmode_flags = acpi_realmode_flags;

	header->real_magic = 0x12345678;

arch/x86/kernel/efi_32.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void efi_call_phys_prelog(void) 
	 * directory. If I have PAE, I just need to duplicate one entry in

	 * page directory.

	 */

	cr4 = read_cr4();

	cr4 = read_cr4_safe();



	if (cr4 & X86_CR4_PAE) {

		efi_bak_pg_dir_pointer[0].pgd =
@@ -91,7 +91,7 @@ void efi_call_phys_epilog(void) 
	gdt_descr.size = GDT_SIZE - 1;

	load_gdt(&gdt_descr);



	cr4 = read_cr4();

	cr4 = read_cr4_safe();



	if (cr4 & X86_CR4_PAE) {

		swapper_pg_dir[pgd_index(0)].pgd =

arch/x86/kernel/mmconf-fam10h_64.c

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ static struct dmi_system_id __devinitdata mmconf_dmi_table[] = { 
	{}

};



void __init check_enable_amd_mmconf_dmi(void)

void __cpuinit check_enable_amd_mmconf_dmi(void)

{

	dmi_check_system(mmconf_dmi_table);

}