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

Commit a1cc1ba7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:
  Revert "Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h"
  Add dma_debug_init() for ia64
  Fix ia64 compilation IS_ERR and PTE_ERR errors.
parents 499ee071 18282b36

arch/ia64/include/asm/fpu.h

+2 −0
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ 
 *	David Mosberger-Tang <davidm@hpl.hp.com>

 */



#include <linux/types.h>



/* floating point status register: */

#define FPSR_TRAP_VD	(1 << 0)	/* invalid op trap disabled */

#define FPSR_TRAP_DD	(1 << 1)	/* denormal trap disabled */

arch/ia64/include/asm/xen/hypervisor.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#ifndef _ASM_IA64_XEN_HYPERVISOR_H

#define _ASM_IA64_XEN_HYPERVISOR_H



#include <linux/err.h>

#include <xen/interface/xen.h>

#include <xen/interface/version.h>	/* to compile feature.c */

#include <xen/features.h>		/* to comiple xen-netfront.c */

arch/ia64/kernel/dma-mapping.c

+8 −0
Original line number Diff line number Diff line
@@ -6,6 +6,14 @@ int iommu_detected __read_mostly; 
struct dma_map_ops *dma_ops;

EXPORT_SYMBOL(dma_ops);



#define PREALLOC_DMA_DEBUG_ENTRIES (1 << 16)



static int __init dma_init(void)

{

       dma_debug_init(PREALLOC_DMA_DEBUG_ENTRIES);

}

fs_initcall(dma_init);



struct dma_map_ops *dma_get_ops(struct device *dev)

{

	return dma_ops;