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

Commit 10d3285d authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/urgent' into x86/core 



Conflicts:

	include/asm-x86/gpio.h

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 6dec3a10 3a61ec38

arch/x86/Kconfig

+11 −15
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ config X86 
	select HAVE_OPROFILE

	select HAVE_IOREMAP_PROT

	select HAVE_KPROBES

	select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select HAVE_KRETPROBES

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FTRACE
@@ -332,20 +332,6 @@ config X86_BIGSMP 


endif



config X86_RDC321X

	bool "RDC R-321x SoC"

	depends on X86_32

	select M486

	select X86_REBOOTFIXUPS

	select GENERIC_GPIO

	select LEDS_CLASS

	select LEDS_GPIO

	select NEW_LEDS

	help

	  This option is needed for RDC R-321x system-on-chip, also known

	  as R-8610-(G).

	  If you don't have one of these chips, you should say N here.



config X86_VSMP

	bool "Support for ScaleMP vSMP"

	select PARAVIRT
@@ -369,6 +355,16 @@ config X86_VISWS 
	  A kernel compiled for the Visual Workstation will run on general

	  PCs as well. See <file:Documentation/sgi-visws.txt> for details.



config X86_RDC321X

	bool "RDC R-321x SoC"

	depends on X86_32

	select M486

	select X86_REBOOTFIXUPS

	help

	  This option is needed for RDC R-321x system-on-chip, also known

	  as R-8610-(G).

	  If you don't have one of these chips, you should say N here.



config SCHED_NO_NO_OMIT_FRAME_POINTER

	def_bool y

	prompt "Single-depth WCHAN output"

arch/x86/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -118,11 +118,6 @@ mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic 
fcore-$(CONFIG_X86_GENERICARCH)	+= arch/x86/mach-generic/

mcore-$(CONFIG_X86_GENERICARCH)	:= arch/x86/mach-default/



# RDC R-321x subarch support

mflags-$(CONFIG_X86_RDC321X)	:= -Iinclude/asm-x86/mach-rdc321x

mcore-$(CONFIG_X86_RDC321X)	:= arch/x86/mach-default/

core-$(CONFIG_X86_RDC321X)	+= arch/x86/mach-rdc321x/



# default subarch .h files

mflags-y += -Iinclude/asm-x86/mach-default

arch/x86/kernel/amd_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -667,7 +667,7 @@ static int get_device_resources(struct device *dev, 
	_bdf = calc_devid(pcidev->bus->number, pcidev->devfn);



	/* device not translated by any IOMMU in the system? */

	if (_bdf >= amd_iommu_last_bdf) {

	if (_bdf > amd_iommu_last_bdf) {

		*iommu = NULL;

		*domain = NULL;

		*bdf = 0xffff;
@@ -1085,7 +1085,7 @@ void prealloc_protection_domains(void) 


	while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {

		devid = (dev->bus->number << 8) | dev->devfn;

		if (devid >= amd_iommu_last_bdf)

		if (devid > amd_iommu_last_bdf)

			continue;

		devid = amd_iommu_alias_table[devid];

		if (domain_for_device(devid))

arch/x86/kernel/amd_iommu_init.c

+2 −2
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static int __init init_exclusion_range(struct ivmd_header *m) 
		set_device_exclusion_range(m->devid, m);

		break;

	case ACPI_IVMD_TYPE_ALL:

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

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

			set_device_exclusion_range(i, m);

		break;

	case ACPI_IVMD_TYPE_RANGE:
@@ -934,7 +934,7 @@ int __init amd_iommu_init(void) 
	/*

	 * let all alias entries point to itself

	 */

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

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

		amd_iommu_alias_table[i] = i;



	/*

include/asm-x86/gpio.h

+0 −6
Original line number Diff line number Diff line
@@ -16,10 +16,6 @@ 
#ifndef _ASM_I386_GPIO_H

#define _ASM_I386_GPIO_H



#ifdef CONFIG_X86_RDC321X

#include <gpio.h>

#else /* CONFIG_X86_RDC321X */



#include <asm-generic/gpio.h>



#ifdef CONFIG_GPIOLIB
@@ -57,6 +53,4 @@ static inline int irq_to_gpio(unsigned int irq) 


#endif /* CONFIG_GPIOLIB */



#endif /* CONFIG_X86_RDC321X */



#endif /* ASM_X86__GPIO_H */