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

Commit 5bb241b3 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: Remove redundant non-NUMA topology functions
  x86: early_printk: Protect against using the same device twice
  x86: Reduce verbosity of "PAT enabled" kernel message
  x86: Reduce verbosity of "TSC is reliable" message
  x86: mce: Use safer ways to access MCE registers
  x86: mce, inject: Use real inject-msg in raise_local
  x86: mce: Fix thermal throttling message storm
  x86: mce: Clean up thermal throttling state tracking code
  x86: split NX setup into separate file to limit unstack-protected code
  xen: check EFER for NX before setting up GDT mapping
  x86: Cleanup linker script using new linker script macros.
  x86: Use section .data.page_aligned for the idt_table.
  x86: convert to use __HEAD and HEAD_TEXT macros.
  x86: convert compressed loader to use __HEAD and HEAD_TEXT macros.
  x86: fix fragile computation of vsyscall address
parents 76e0134f 704daf55

arch/x86/boot/compressed/head_32.S

+2 −1
Original line number Diff line number Diff line
@@ -23,13 +23,14 @@ 
 */

	.text



#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/page_types.h>

#include <asm/boot.h>

#include <asm/asm-offsets.h>



	.section ".text.head","ax",@progbits

	__HEAD

ENTRY(startup_32)

	cld

	/*

arch/x86/boot/compressed/head_64.S

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
	.code32

	.text



#include <linux/init.h>

#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/pgtable_types.h>
@@ -33,7 +34,7 @@ 
#include <asm/processor-flags.h>

#include <asm/asm-offsets.h>



	.section ".text.head"

	__HEAD

	.code32

ENTRY(startup_32)

	cld

arch/x86/boot/compressed/vmlinux.lds.S

+4 −2
Original line number Diff line number Diff line 
#include <asm-generic/vmlinux.lds.h>



OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)



#undef i386
@@ -18,9 +20,9 @@ SECTIONS 
	 * address 0.

	 */

	. = 0;

	.text.head : {

	.head.text : {

		_head = . ;

		*(.text.head)

		HEAD_TEXT

		_ehead = . ;

	}

	.rodata.compressed : {

arch/x86/include/asm/pgtable_types.h

+1 −0
Original line number Diff line number Diff line
@@ -277,6 +277,7 @@ static inline pteval_t pte_flags(pte_t pte) 
typedef struct page *pgtable_t;



extern pteval_t __supported_pte_mask;

extern void set_nx(void);

extern int nx_enabled;



#define pgprot_writecombine	pgprot_writecombine

arch/x86/include/asm/topology.h

+0 −10
Original line number Diff line number Diff line
@@ -165,21 +165,11 @@ static inline int numa_node_id(void) 
	return 0;

}



static inline int cpu_to_node(int cpu)

{

	return 0;

}



static inline int early_cpu_to_node(int cpu)

{

	return 0;

}



static inline const struct cpumask *cpumask_of_node(int node)

{

	return cpu_online_mask;

}



static inline void setup_node_to_cpumask_map(void) { }



#endif