Commit e33c0197 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (36 commits)
  x86, mm: Correct the implementation of is_untracked_pat_range()
  x86/pat: Trivial: don't create debugfs for memtype if pat is disabled
  x86, mtrr: Fix sorting of mtrr after subtracting
  x86: Move find_smp_config() earlier and avoid bootmem usage
  x86, platform: Change is_untracked_pat_range() to bool; cleanup init
  x86: Change is_ISA_range() into an inline function
  x86, mm: is_untracked_pat_range() takes a normal semiclosed range
  x86, mm: Call is_untracked_pat_range() rather than is_ISA_range()
  x86: UV SGI: Don't track GRU space in PAT
  x86: SGI UV: Fix BAU initialization
  x86, numa: Use near(er) online node instead of roundrobin for NUMA
  x86, numa, bootmem: Only free bootmem on NUMA failure path
  x86: Change crash kernel to reserve via reserve_early()
  x86: Eliminate redundant/contradicting cache line size config options
  x86: When cleaning MTRRs, do not fold WP into UC
  x86: remove "extern" from function prototypes in <asm/proto.h>
  x86, mm: Report state of NX protections during boot
  x86, mm: Clean up and simplify NX enablement
  x86, pageattr: Make set_memory_(x|nx) aware of NX support
  x86, sleep: Always save the value of EFER
  ...

Fix up conflicts (added both iommu_shutdown and is_untracked_pat_range)
to 'struct x86_platform_ops') in
	arch/x86/include/asm/x86_init.h
	arch/x86/kernel/x86_init.c
parents 343036ce ccef0864

arch/x86/Kconfig.cpu

+5 −9
Original line number Diff line number Diff line
@@ -301,15 +301,11 @@ config X86_CPU 


#

# Define implied options from the CPU selection here

config X86_L1_CACHE_BYTES

config X86_INTERNODE_CACHE_SHIFT

	int

	default "128" if MPSC

	default "64" if GENERIC_CPU || MK8 || MCORE2 || MATOM || X86_32



config X86_INTERNODE_CACHE_BYTES

	int

	default "4096" if X86_VSMP

	default X86_L1_CACHE_BYTES if !X86_VSMP

	default "12" if X86_VSMP

	default "7" if NUMA

	default X86_L1_CACHE_SHIFT



config X86_CMPXCHG

	def_bool X86_64 || (X86_32 && !M386)
@@ -317,9 +313,9 @@ config X86_CMPXCHG 
config X86_L1_CACHE_SHIFT

	int

	default "7" if MPENTIUM4 || MPSC

	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU

	default "4" if X86_ELAN || M486 || M386 || MGEODEGX1

	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX

	default "6" if MK7 || MK8 || MPENTIUMM || MCORE2 || MATOM || MVIAC7 || X86_GENERIC || GENERIC_CPU



config X86_XADD

	def_bool y

arch/x86/boot/compressed/head_64.S

+1 −2
Original line number Diff line number Diff line
@@ -107,8 +107,7 @@ ENTRY(startup_32) 
	lgdt	gdt(%ebp)



	/* Enable PAE mode */

	xorl	%eax, %eax

	orl	$(X86_CR4_PAE), %eax

	movl	$(X86_CR4_PAE), %eax

	movl	%eax, %cr4



 /*

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

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT) 


#undef i386



#include <asm/cache.h>

#include <asm/page_types.h>



#ifdef CONFIG_X86_64
@@ -46,7 +47,7 @@ SECTIONS 
		*(.data.*)

		_edata = . ;

	}

	. = ALIGN(CONFIG_X86_L1_CACHE_BYTES);

	. = ALIGN(L1_CACHE_BYTES);

	.bss : {

		_bss = . ;

		*(.bss)

arch/x86/include/asm/acpi.h

+2 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ extern void acpi_restore_state_mem(void); 
extern unsigned long acpi_wakeup_address;



/* early initialization routine */

extern void acpi_reserve_bootmem(void);

extern void acpi_reserve_wakeup_memory(void);



/*

 * Check if the CPU can handle C2 and deeper
@@ -158,6 +158,7 @@ struct bootnode; 


#ifdef CONFIG_ACPI_NUMA

extern int acpi_numa;

extern int acpi_get_nodes(struct bootnode *physnodes);

extern int acpi_scan_nodes(unsigned long start, unsigned long end);

#define NR_NODE_MEMBLKS (MAX_NUMNODES*2)

extern void acpi_fake_nodes(const struct bootnode *fake_nodes,

arch/x86/include/asm/cache.h

+4 −3
Original line number Diff line number Diff line
@@ -9,12 +9,13 @@ 


#define __read_mostly __attribute__((__section__(".data.read_mostly")))



#define INTERNODE_CACHE_SHIFT CONFIG_X86_INTERNODE_CACHE_SHIFT

#define INTERNODE_CACHE_BYTES (1 << INTERNODE_CACHE_SHIFT)



#ifdef CONFIG_X86_VSMP

/* vSMP Internode cacheline shift */

#define INTERNODE_CACHE_SHIFT (12)

#ifdef CONFIG_SMP

#define __cacheline_aligned_in_smp					\

	__attribute__((__aligned__(1 << (INTERNODE_CACHE_SHIFT))))	\

	__attribute__((__aligned__(INTERNODE_CACHE_BYTES)))		\

	__page_aligned_data

#endif

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE