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

Commit 167b7129 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, smpboot: Fix cores per node printing on boot
  x86/amd-iommu: Fall back to GART if initialization fails
  x86/amd-iommu: Fix crash when request_mem_region fails
  x86/mm: Remove unused DBG() macro
  arch/x86/kernel: Add missing spin_unlock
parents 39059cce 4adc8b71

arch/x86/kernel/amd_iommu.c

+9 −7
Original line number Diff line number Diff line
@@ -1487,6 +1487,7 @@ static int __attach_device(struct device *dev, 
			   struct protection_domain *domain)

{

	struct iommu_dev_data *dev_data, *alias_data;

	int ret;



	dev_data   = get_dev_data(dev);

	alias_data = get_dev_data(dev_data->alias);
@@ -1498,13 +1499,14 @@ static int __attach_device(struct device *dev, 
	spin_lock(&domain->lock);



	/* Some sanity checks */

	ret = -EBUSY;

	if (alias_data->domain != NULL &&

	    alias_data->domain != domain)

		return -EBUSY;

		goto out_unlock;



	if (dev_data->domain != NULL &&

	    dev_data->domain != domain)

		return -EBUSY;

		goto out_unlock;



	/* Do real assignment */

	if (dev_data->alias != dev) {
@@ -1520,10 +1522,14 @@ static int __attach_device(struct device *dev, 


	atomic_inc(&dev_data->bind);



	ret = 0;



out_unlock:



	/* ready */

	spin_unlock(&domain->lock);



	return 0;

	return ret;

}



/*
@@ -2324,10 +2330,6 @@ int __init amd_iommu_init_dma_ops(void) 


	iommu_detected = 1;

	swiotlb = 0;

#ifdef CONFIG_GART_IOMMU

	gart_iommu_aperture_disabled = 1;

	gart_iommu_aperture = 0;

#endif



	/* Make the driver finally visible to the drivers */

	dma_ops = &amd_iommu_dma_ops;

arch/x86/kernel/amd_iommu_init.c

+17 −3
Original line number Diff line number Diff line
@@ -287,8 +287,12 @@ static u8 * __init iommu_map_mmio_space(u64 address) 
{

	u8 *ret;



	if (!request_mem_region(address, MMIO_REGION_LENGTH, "amd_iommu"))

	if (!request_mem_region(address, MMIO_REGION_LENGTH, "amd_iommu")) {

		pr_err("AMD-Vi: Can not reserve memory region %llx for mmio\n",

			address);

		pr_err("AMD-Vi: This is a BIOS bug. Please contact your hardware vendor\n");

		return NULL;

	}



	ret = ioremap_nocache(address, MMIO_REGION_LENGTH);

	if (ret != NULL)
@@ -1314,7 +1318,7 @@ static int __init amd_iommu_init(void) 
		ret = amd_iommu_init_dma_ops();



	if (ret)

		goto free;

		goto free_disable;



	amd_iommu_init_api();
@@ -1332,9 +1336,10 @@ static int __init amd_iommu_init(void) 
out:

	return ret;



free:

free_disable:

	disable_iommus();



free:

	amd_iommu_uninit_devices();



	free_pages((unsigned long)amd_iommu_pd_alloc_bitmap,
@@ -1353,6 +1358,15 @@ static int __init amd_iommu_init(void) 


	free_unity_maps();



#ifdef CONFIG_GART_IOMMU

	/*

	 * We failed to initialize the AMD IOMMU - try fallback to GART

	 * if possible.

	 */

	gart_iommu_init();



#endif



	goto out;

}

arch/x86/kernel/setup_percpu.c

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ 
#include <asm/cpu.h>

#include <asm/stackprotector.h>



#ifdef CONFIG_DEBUG_PER_CPU_MAPS

# define DBG(fmt, ...) pr_dbg(fmt, ##__VA_ARGS__)

#else

# define DBG(fmt, ...) do { if (0) pr_dbg(fmt, ##__VA_ARGS__); } while (0)

#endif



DEFINE_PER_CPU(int, cpu_number);

EXPORT_PER_CPU_SYMBOL(cpu_number);

arch/x86/kernel/smpboot.c

+1 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static void __cpuinit do_fork_idle(struct work_struct *work) 
static void __cpuinit announce_cpu(int cpu, int apicid)

{

	static int current_node = -1;

	int node = cpu_to_node(cpu);

	int node = early_cpu_to_node(cpu);



	if (system_state == SYSTEM_BOOTING) {

		if (node != current_node) {

arch/x86/mm/numa.c

+0 −6
Original line number Diff line number Diff line
@@ -3,12 +3,6 @@ 
#include <linux/module.h>

#include <linux/bootmem.h>



#ifdef CONFIG_DEBUG_PER_CPU_MAPS

# define DBG(x...) printk(KERN_DEBUG x)

#else

# define DBG(x...)

#endif



/*

 * Which logical CPUs are on which nodes

 */