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

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
...@@ -23,7 +23,7 @@ config X86 ...@@ -23,7 +23,7 @@ config X86
select HAVE_OPROFILE select HAVE_OPROFILE
select HAVE_IOREMAP_PROT select HAVE_IOREMAP_PROT
select HAVE_KPROBES select HAVE_KPROBES
select ARCH_WANT_OPTIONAL_GPIOLIB if !X86_RDC321X select ARCH_WANT_OPTIONAL_GPIOLIB
select HAVE_KRETPROBES select HAVE_KRETPROBES
select HAVE_DYNAMIC_FTRACE select HAVE_DYNAMIC_FTRACE
select HAVE_FTRACE select HAVE_FTRACE
...@@ -332,20 +332,6 @@ config X86_BIGSMP ...@@ -332,20 +332,6 @@ config X86_BIGSMP
endif 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 config X86_VSMP
bool "Support for ScaleMP vSMP" bool "Support for ScaleMP vSMP"
select PARAVIRT select PARAVIRT
...@@ -369,6 +355,16 @@ config X86_VISWS ...@@ -369,6 +355,16 @@ config X86_VISWS
A kernel compiled for the Visual Workstation will run on general A kernel compiled for the Visual Workstation will run on general
PCs as well. See <file:Documentation/sgi-visws.txt> for details. 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 config SCHED_NO_NO_OMIT_FRAME_POINTER
def_bool y def_bool y
prompt "Single-depth WCHAN output" prompt "Single-depth WCHAN output"
......
...@@ -118,11 +118,6 @@ mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic ...@@ -118,11 +118,6 @@ mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/ 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 # default subarch .h files
mflags-y += -Iinclude/asm-x86/mach-default mflags-y += -Iinclude/asm-x86/mach-default
......
...@@ -667,7 +667,7 @@ static int get_device_resources(struct device *dev, ...@@ -667,7 +667,7 @@ static int get_device_resources(struct device *dev,
_bdf = calc_devid(pcidev->bus->number, pcidev->devfn); _bdf = calc_devid(pcidev->bus->number, pcidev->devfn);
/* device not translated by any IOMMU in the system? */ /* device not translated by any IOMMU in the system? */
if (_bdf >= amd_iommu_last_bdf) { if (_bdf > amd_iommu_last_bdf) {
*iommu = NULL; *iommu = NULL;
*domain = NULL; *domain = NULL;
*bdf = 0xffff; *bdf = 0xffff;
...@@ -1085,7 +1085,7 @@ void prealloc_protection_domains(void) ...@@ -1085,7 +1085,7 @@ void prealloc_protection_domains(void)
while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { while ((dev = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) {
devid = (dev->bus->number << 8) | dev->devfn; devid = (dev->bus->number << 8) | dev->devfn;
if (devid >= amd_iommu_last_bdf) if (devid > amd_iommu_last_bdf)
continue; continue;
devid = amd_iommu_alias_table[devid]; devid = amd_iommu_alias_table[devid];
if (domain_for_device(devid)) if (domain_for_device(devid))
......
...@@ -732,7 +732,7 @@ static int __init init_exclusion_range(struct ivmd_header *m) ...@@ -732,7 +732,7 @@ static int __init init_exclusion_range(struct ivmd_header *m)
set_device_exclusion_range(m->devid, m); set_device_exclusion_range(m->devid, m);
break; break;
case ACPI_IVMD_TYPE_ALL: 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); set_device_exclusion_range(i, m);
break; break;
case ACPI_IVMD_TYPE_RANGE: case ACPI_IVMD_TYPE_RANGE:
...@@ -934,7 +934,7 @@ int __init amd_iommu_init(void) ...@@ -934,7 +934,7 @@ int __init amd_iommu_init(void)
/* /*
* let all alias entries point to itself * 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; amd_iommu_alias_table[i] = i;
/* /*
......
...@@ -16,10 +16,6 @@ ...@@ -16,10 +16,6 @@
#ifndef _ASM_I386_GPIO_H #ifndef _ASM_I386_GPIO_H
#define _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> #include <asm-generic/gpio.h>
#ifdef CONFIG_GPIOLIB #ifdef CONFIG_GPIOLIB
...@@ -57,6 +53,4 @@ static inline int irq_to_gpio(unsigned int irq) ...@@ -57,6 +53,4 @@ static inline int irq_to_gpio(unsigned int irq)
#endif /* CONFIG_GPIOLIB */ #endif /* CONFIG_GPIOLIB */
#endif /* CONFIG_X86_RDC321X */
#endif /* ASM_X86__GPIO_H */ #endif /* ASM_X86__GPIO_H */
...@@ -122,7 +122,7 @@ static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_id_map) ...@@ -122,7 +122,7 @@ static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_id_map)
static inline physid_mask_t apicid_to_cpu_present(int apicid) static inline physid_mask_t apicid_to_cpu_present(int apicid)
{ {
return physid_mask_of_physid(0); return physid_mask_of_physid(apicid);
} }
static inline void setup_portio_remap(void) static inline void setup_portio_remap(void)
......
...@@ -8,7 +8,13 @@ ...@@ -8,7 +8,13 @@
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#define ELFCORE_ADDR_MAX (-1ULL) #define ELFCORE_ADDR_MAX (-1ULL)
#ifdef CONFIG_PROC_VMCORE
extern unsigned long long elfcorehdr_addr; extern unsigned long long elfcorehdr_addr;
#else
static const unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
#endif
extern ssize_t copy_oldmem_page(unsigned long, char *, size_t, extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
unsigned long, int); unsigned long, int);
extern const struct file_operations proc_vmcore_operations; extern const struct file_operations proc_vmcore_operations;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment