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

Commit 75b08038 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, mce: Clean up thermal init by introducing intel_thermal_supported()
  x86, mce: Thermal monitoring depends on APIC being enabled
  x86: Gart: fix breakage due to IOMMU initialization cleanup
  x86: Move swiotlb initialization before dma32_free_bootmem
  x86: Fix build warning in arch/x86/mm/mmio-mod.c
  x86: Remove usedac in feature-removal-schedule.txt
  x86: Fix duplicated UV BAU interrupt vector
  nvram: Fix write beyond end condition; prove to gcc copy is safe
  mm: Adjust do_pages_stat() so gcc can see copy_from_user() is safe
  x86: Limit the number of processor bootup messages
  x86: Remove enabling x2apic message for every CPU
  doc: Add documentation for bootloader_{type,version}
  x86, msr: Add support for non-contiguous cpumasks
  x86: Use find_e820() instead of hard coded trampoline address
  x86, AMD: Fix stale cpuid4_info shared_map data in shared_cpu_map cpumasks

Trivial percpu-naming-introduced conflicts in arch/x86/kernel/cpu/intel_cacheinfo.c
parents fb1beb29 70fe4407

Documentation/feature-removal-schedule.txt

+0 −7
Original line number Diff line number Diff line
@@ -291,13 +291,6 @@ Who: Michael Buesch <mb@bu3sch.de> 


---------------------------



What:	usedac i386 kernel parameter

When:	2.6.27

Why:	replaced by allowdac and no dac combination

Who:	Glauber Costa <gcosta@redhat.com>



---------------------------



What: print_fn_descriptor_symbol()

When: October 2009

Why:  The %pF vsprintf format provides the same functionality in a

Documentation/sysctl/kernel.txt

+31 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ Currently, these files might (depending on your configuration) 
show up in /proc/sys/kernel:

- acpi_video_flags

- acct

- bootloader_type	     [ X86 only ]

- bootloader_version	     [ X86 only ]

- callhome		     [ S390 only ]

- auto_msgmni

- core_pattern
@@ -93,6 +95,35 @@ valid for 30 seconds. 


==============================================================



bootloader_type:



x86 bootloader identification



This gives the bootloader type number as indicated by the bootloader,

shifted left by 4, and OR'd with the low four bits of the bootloader

version.  The reason for this encoding is that this used to match the

type_of_loader field in the kernel header; the encoding is kept for

backwards compatibility.  That is, if the full bootloader type number

is 0x15 and the full version number is 0x234, this file will contain

the value 340 = 0x154.



See the type_of_loader and ext_loader_type fields in

Documentation/x86/boot.txt for additional information.



==============================================================



bootloader_version:



x86 bootloader version



The complete bootloader version number.  In the example above, this

file will contain the value 564 = 0x234.



See the type_of_loader and ext_loader_ver fields in

Documentation/x86/boot.txt for additional information.



==============================================================



callhome:



Controls the kernel's callhome behavior in case of a kernel panic.

arch/x86/include/asm/irq_vectors.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
 */

#define LOCAL_PENDING_VECTOR		0xec



#define UV_BAU_MESSAGE			0xec

#define UV_BAU_MESSAGE			0xea



/*

 * Self IPI vector for machine checks

arch/x86/include/asm/msr.h

+3 −0
Original line number Diff line number Diff line
@@ -244,6 +244,9 @@ do { \ 


#define write_rdtscp_aux(val) wrmsr(0xc0000103, (val), 0)



struct msr *msrs_alloc(void);

void msrs_free(struct msr *msrs);



#ifdef CONFIG_SMP

int rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);

int wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);

arch/x86/include/asm/trampoline.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ extern unsigned long initial_code; 
extern unsigned long initial_gs;



#define TRAMPOLINE_SIZE roundup(trampoline_end - trampoline_data, PAGE_SIZE)

#define TRAMPOLINE_BASE 0x6000



extern unsigned long setup_trampoline(void);

extern void __init reserve_trampoline_memory(void);