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

Commit 101d5b71 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/signal' into core/signal 



Conflicts:
	arch/x86/kernel/cpu/feature_names.c
	arch/x86/kernel/setup.c
	drivers/pci/intel-iommu.c
	include/asm-x86/cpufeature.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents cec5eb7b e6babb6b

Documentation/kernel-parameters.txt

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


	nolapic_timer	[X86-32,APIC] Do not use the local APIC timer.



	nox2apic	[X86-64,APIC] Do not enable x2APIC mode.



	x2apic_phys	[X86-64,APIC] Use x2apic physical mode instead of

			default x2apic cluster mode on platforms

			supporting x2apic.



	noltlbs		[PPC] Do not use large page/tlb entries for kernel

			lowmem mapping on PPC40x.

arch/x86/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ config X86 
	select HAVE_FTRACE

	select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)

	select HAVE_ARCH_KGDB if !X86_VOYAGER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_GENERIC_DMA_COHERENT if X86_32

	select HAVE_EFFICIENT_UNALIGNED_ACCESS
@@ -1643,6 +1644,14 @@ config DMAR_FLOPPY_WA 
	 workaround will setup a 1:1 mapping for the first

	 16M to make floppy (an ISA device) work.



config INTR_REMAP

	bool "Support for Interrupt Remapping (EXPERIMENTAL)"

	depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL

	help

	 Supports Interrupt remapping for IO-APIC and MSI devices.

	 To use x2apic mode in the CPU's which support x2APIC enhancements or

	 to support platforms with CPU's having > 8 bit APIC ID, say Y.



source "drivers/pci/pcie/Kconfig"



source "drivers/pci/Kconfig"

arch/x86/Kconfig.cpu

+70 −0
Original line number Diff line number Diff line
@@ -418,3 +418,73 @@ config X86_MINIMUM_CPU_FAMILY 
config X86_DEBUGCTLMSR

	def_bool y

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486 || M386)



menuconfig PROCESSOR_SELECT

	default y

	bool "Supported processor vendors" if EMBEDDED

	help

	  This lets you choose what x86 vendor support code your kernel

	  will include.



config CPU_SUP_INTEL_32

	default y

	bool "Support Intel processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for Intel processors



config CPU_SUP_INTEL_64

	default y

	bool "Support Intel processors" if PROCESSOR_SELECT

	depends on 64BIT

	help

	  This enables extended support for Intel processors



config CPU_SUP_CYRIX_32

	default y

	bool "Support Cyrix processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for Cyrix processors



config CPU_SUP_AMD_32

	default y

	bool "Support AMD processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for AMD processors



config CPU_SUP_AMD_64

	default y

	bool "Support AMD processors" if PROCESSOR_SELECT

	depends on 64BIT

	help

	  This enables extended support for AMD processors



config CPU_SUP_CENTAUR_32

	default y

	bool "Support Centaur processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for Centaur processors



config CPU_SUP_CENTAUR_64

	default y

	bool "Support Centaur processors" if PROCESSOR_SELECT

	depends on 64BIT

	help

	  This enables extended support for Centaur processors



config CPU_SUP_TRANSMETA_32

	default y

	bool "Support Transmeta processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for Transmeta processors



config CPU_SUP_UMC_32

	default y

	bool "Support UMC processors" if PROCESSOR_SELECT

	depends on !64BIT

	help

	  This enables extended support for UMC processors

arch/x86/boot/compressed/head_32.S

+3 −2
Original line number Diff line number Diff line
@@ -137,14 +137,15 @@ relocated: 
 */

	movl output_len(%ebx), %eax

	pushl %eax

			# push arguments for decompress_kernel:

	pushl %ebp	# output address

	movl input_len(%ebx), %eax

	pushl %eax	# input_len

	leal input_data(%ebx), %eax

	pushl %eax	# input_data

	leal boot_heap(%ebx), %eax

	pushl %eax	# heap area as third argument

	pushl %esi	# real mode pointer as second arg

	pushl %eax	# heap area

	pushl %esi	# real mode pointer

	call decompress_kernel

	addl $20, %esp

	popl %ecx

arch/x86/boot/compressed/misc.c

+7 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
 */

#undef CONFIG_PARAVIRT

#ifdef CONFIG_X86_32

#define _ASM_DESC_H_ 1

#define ASM_X86__DESC_H 1

#endif



#ifdef CONFIG_X86_64
@@ -27,7 +27,7 @@ 
#include <linux/linkage.h>

#include <linux/screen_info.h>

#include <linux/elf.h>

#include <asm/io.h>

#include <linux/io.h>

#include <asm/page.h>

#include <asm/boot.h>

#include <asm/bootparam.h>
@@ -277,7 +277,8 @@ static void *memset(void *s, int c, unsigned n) 
	int i;

	char *ss = s;



	for (i = 0; i < n; i++) ss[i] = c;

	for (i = 0; i < n; i++)

		ss[i] = c;

	return s;

}
@@ -287,7 +288,8 @@ static void *memcpy(void *dest, const void *src, unsigned n) 
	const char *s = src;

	char *d = dest;



	for (i = 0; i < n; i++) d[i] = s[i];

	for (i = 0; i < n; i++)

		d[i] = s[i];

	return dest;

}