Commit 1dc60c53 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 compile error with CONFIG_AS_CFI=n
  Documentation: document debugpat commandline option
  x86: sanitize Kconfig
  x86, suspend, acpi: correct and add comments about Big Real Mode
  x86, suspend, acpi: enter Big Real Mode

Fixed trivial conflict in include/asm-x86/dwarf2.h due to just using
different names for "cfi_ignore" (vs "__cfi_ignore") macro.
parents 8d2567a6 3f1c3872

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -571,6 +571,8 @@ and is between 256 and 4096 characters. It is defined in the file 


	debug_objects	[KNL] Enable object debugging



	debugpat	[X86] Enable PAT debugging



	decnet.addr=	[HW,NET]

			Format: <area>[,<node>]

			See also Documentation/networking/decnet.txt.

arch/x86/Kconfig

+9 −13
Original line number Diff line number Diff line
@@ -447,7 +447,6 @@ config PARAVIRT_DEBUG 
config MEMTEST

	bool "Memtest"

	depends on X86_64

	default y

	help

	  This option adds a kernel parameter 'memtest', which allows memtest

	  to be set.
@@ -455,7 +454,7 @@ config MEMTEST 
		memtest=1, mean do 1 test pattern;

		...

		memtest=4, mean do 4 test patterns.

	  If you are unsure how to answer this question, answer Y.

	  If you are unsure how to answer this question, answer N.



config X86_SUMMIT_NUMA

	def_bool y
@@ -1135,21 +1134,18 @@ config MTRR 
	  See <file:Documentation/mtrr.txt> for more information.



config MTRR_SANITIZER

	def_bool y

	bool

	prompt "MTRR cleanup support"

	depends on MTRR

	help

	  Convert MTRR layout from continuous to discrete, so some X driver

	  could add WB entries.

	  Convert MTRR layout from continuous to discrete, so X drivers can

	  add writeback entries.



	  Say N here if you see bootup problems (boot crash, boot hang,

	  spontaneous reboots).

	  Can be disabled with disable_mtrr_cleanup on the kernel command line.

	  The largest mtrr entry size for a continous block can be set with

	  mtrr_chunk_size.



	  Could be disabled with disable_mtrr_cleanup. Also mtrr_chunk_size

	  could be used to send largest mtrr entry size for continuous block

	  to hold holes (aka. UC entries)



	  If unsure, say Y.

	  If unsure, say N.



config MTRR_SANITIZER_ENABLE_DEFAULT

	int "MTRR cleanup enable value (0-1)"
@@ -1166,7 +1162,7 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT 
	depends on MTRR_SANITIZER

	help

	  mtrr cleanup spare entries default, it can be changed via

	  mtrr_spare_reg_nr=

	  mtrr_spare_reg_nr=N on the kernel command line.



config X86_PAT

	bool

arch/x86/kernel/acpi/sleep.c

+24 −6
Original line number Diff line number Diff line
@@ -23,6 +23,15 @@ static unsigned long acpi_realmode; 
static char temp_stack[10240];

#endif



/* XXX: this macro should move to asm-x86/segment.h and be shared with the

   boot code... */

#define GDT_ENTRY(flags, base, limit)		\

	(((u64)(base & 0xff000000) << 32) |	\

	 ((u64)flags << 40) |			\

	 ((u64)(limit & 0x00ff0000) << 32) |	\

	 ((u64)(base & 0x00ffffff) << 16) |	\

	 ((u64)(limit & 0x0000ffff)))



/**

 * acpi_save_state_mem - save kernel state

 *
@@ -51,18 +60,27 @@ int acpi_save_state_mem(void) 
	header->video_mode = saved_video_mode;



	header->wakeup_jmp_seg = acpi_wakeup_address >> 4;



	/*

	 * Set up the wakeup GDT.  We set these up as Big Real Mode,

	 * that is, with limits set to 4 GB.  At least the Lenovo

	 * Thinkpad X61 is known to need this for the video BIOS

	 * initialization quirk to work; this is likely to also

	 * be the case for other laptops or integrated video devices.

	 */



	/* GDT[0]: GDT self-pointer */

	header->wakeup_gdt[0] =

		(u64)(sizeof(header->wakeup_gdt) - 1) +

		((u64)(acpi_wakeup_address +

			((char *)&header->wakeup_gdt - (char *)acpi_realmode))

				<< 16);

	/* GDT[1]: real-mode-like code segment */

	header->wakeup_gdt[1] = (0x009bULL << 40) +

		((u64)acpi_wakeup_address << 16) + 0xffff;

	/* GDT[2]: real-mode-like data segment */

	header->wakeup_gdt[2] = (0x0093ULL << 40) +

		((u64)acpi_wakeup_address << 16) + 0xffff;

	/* GDT[1]: big real mode-like code segment */

	header->wakeup_gdt[1] =

		GDT_ENTRY(0x809b, acpi_wakeup_address, 0xfffff);

	/* GDT[2]: big real mode-like data segment */

	header->wakeup_gdt[2] =

		GDT_ENTRY(0x8093, acpi_wakeup_address, 0xfffff);



#ifndef CONFIG_64BIT

	store_gdt((struct desc_ptr *)&header->pmode_gdt);

include/asm-x86/dwarf2.h

+15 −15
Original line number Diff line number Diff line
@@ -38,23 +38,23 @@ 


/* Due to the structure of pre-exisiting code, don't use assembler line

   comment character # to ignore the arguments. Instead, use a dummy macro. */

.macro __cfi_ignore a=0, b=0, c=0, d=0

.macro cfi_ignore a=0, b=0, c=0, d=0

.endm



#define CFI_STARTPROC	__cfi_ignore

#define CFI_ENDPROC	__cfi_ignore

#define CFI_DEF_CFA	__cfi_ignore

#define CFI_DEF_CFA_REGISTER	__cfi_ignore

#define CFI_DEF_CFA_OFFSET	__cfi_ignore

#define CFI_ADJUST_CFA_OFFSET	__cfi_ignore

#define CFI_OFFSET	__cfi_ignore

#define CFI_REL_OFFSET	__cfi_ignore

#define CFI_REGISTER	__cfi_ignore

#define CFI_RESTORE	__cfi_ignore

#define CFI_REMEMBER_STATE __cfi_ignore

#define CFI_RESTORE_STATE __cfi_ignore

#define CFI_UNDEFINED __cfi_ignore

#define CFI_SIGNAL_FRAME __cfi_ignore

#define CFI_STARTPROC	cfi_ignore

#define CFI_ENDPROC	cfi_ignore

#define CFI_DEF_CFA	cfi_ignore

#define CFI_DEF_CFA_REGISTER	cfi_ignore

#define CFI_DEF_CFA_OFFSET	cfi_ignore

#define CFI_ADJUST_CFA_OFFSET	cfi_ignore

#define CFI_OFFSET	cfi_ignore

#define CFI_REL_OFFSET	cfi_ignore

#define CFI_REGISTER	cfi_ignore

#define CFI_RESTORE	cfi_ignore

#define CFI_REMEMBER_STATE cfi_ignore

#define CFI_RESTORE_STATE cfi_ignore

#define CFI_UNDEFINED cfi_ignore

#define CFI_SIGNAL_FRAME cfi_ignore



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE