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

Commit 0d8762c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  lockdep: fix irqs on/off ip tracing
  lockdep: minor fix for debug_show_all_locks()
  x86: restore the old swiotlb alloc_coherent behavior
  x86: use GFP_DMA for 24bit coherent_dma_mask
  swiotlb: remove panic for alloc_coherent failure
  xen: compilation fix of drivers/xen/events.c on IA64
  xen: portability clean up and some minor clean up for xencomm.c
  xen: don't reload cr3 on suspend
  kernel/resource: fix reserve_region_with_split() section mismatch
  printk: remove unused code from kernel/printk.c
parents cf76dddb 6afe40b4

arch/x86/include/asm/dma-mapping.h

+3 −1
Original line number Diff line number Diff line
@@ -255,9 +255,11 @@ static inline unsigned long dma_alloc_coherent_mask(struct device *dev, 


static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)

{

#ifdef CONFIG_X86_64

	unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp);



	if (dma_mask <= DMA_24BIT_MASK)

		gfp |= GFP_DMA;

#ifdef CONFIG_X86_64

	if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))

		gfp |= GFP_DMA32;

#endif

arch/x86/kernel/pci-swiotlb_64.c

+13 −1
Original line number Diff line number Diff line
@@ -18,9 +18,21 @@ swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size, 
	return swiotlb_map_single(hwdev, phys_to_virt(paddr), size, direction);

}



static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,

					dma_addr_t *dma_handle, gfp_t flags)

{

	void *vaddr;



	vaddr = dma_generic_alloc_coherent(hwdev, size, dma_handle, flags);

	if (vaddr)

		return vaddr;



	return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);

}



struct dma_mapping_ops swiotlb_dma_ops = {

	.mapping_error = swiotlb_dma_mapping_error,

	.alloc_coherent = swiotlb_alloc_coherent,

	.alloc_coherent = x86_swiotlb_alloc_coherent,

	.free_coherent = swiotlb_free_coherent,

	.map_single = swiotlb_map_single_phys,

	.unmap_single = swiotlb_unmap_single,

drivers/xen/events.c

+1 −1
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ void xen_poll_irq(int irq) 


		poll.nr_ports = 1;

		poll.timeout = 0;

		poll.ports = &evtchn;

		set_xen_guest_handle(poll.ports, &evtchn);



		if (HYPERVISOR_sched_op(SCHEDOP_poll, &poll) != 0)

			BUG();

drivers/xen/manage.c

+0 −2
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ static int xen_suspend(void *data) 


	BUG_ON(!irqs_disabled());



	load_cr3(swapper_pg_dir);



	err = device_power_down(PMSG_SUSPEND);

	if (err) {

		printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",

drivers/xen/xencomm.c

+4 −19
Original line number Diff line number Diff line
@@ -23,13 +23,7 @@ 
#include <asm/page.h>

#include <xen/xencomm.h>

#include <xen/interface/xen.h>

#ifdef __ia64__

#include <asm/xen/xencomm.h>	/* for is_kern_addr() */

#endif



#ifdef HAVE_XEN_PLATFORM_COMPAT_H

#include <xen/platform-compat.h>

#endif

#include <asm/xen/xencomm.h>	/* for xencomm_is_phys_contiguous() */



static int xencomm_init(struct xencomm_desc *desc,

			void *buffer, unsigned long bytes)
@@ -157,20 +151,11 @@ static int xencomm_create(void *buffer, unsigned long bytes, 
	return 0;

}



/* check if memory address is within VMALLOC region  */

static int is_phys_contiguous(unsigned long addr)

{

	if (!is_kernel_addr(addr))

		return 0;



	return (addr < VMALLOC_START) || (addr >= VMALLOC_END);

}



static struct xencomm_handle *xencomm_create_inline(void *ptr)

{

	unsigned long paddr;



	BUG_ON(!is_phys_contiguous((unsigned long)ptr));

	BUG_ON(!xencomm_is_phys_contiguous((unsigned long)ptr));



	paddr = (unsigned long)xencomm_pa(ptr);

	BUG_ON(paddr & XENCOMM_INLINE_FLAG);
@@ -202,7 +187,7 @@ struct xencomm_handle *xencomm_map(void *ptr, unsigned long bytes) 
	int rc;

	struct xencomm_desc *desc;



	if (is_phys_contiguous((unsigned long)ptr))

	if (xencomm_is_phys_contiguous((unsigned long)ptr))

		return xencomm_create_inline(ptr);



	rc = xencomm_create(ptr, bytes, &desc, GFP_KERNEL);
@@ -219,7 +204,7 @@ struct xencomm_handle *__xencomm_map_no_alloc(void *ptr, unsigned long bytes, 
	int rc;

	struct xencomm_desc *desc = NULL;



	if (is_phys_contiguous((unsigned long)ptr))

	if (xencomm_is_phys_contiguous((unsigned long)ptr))

		return xencomm_create_inline(ptr);



	rc = xencomm_create_mini(ptr, bytes, xc_desc,