Skip to content

Commit

Permalink
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…
Browse files Browse the repository at this point in the history
…it/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.
  • Loading branch information
Linus Torvalds committed Jul 17, 2009
2 parents 499ee07 + 18282b3 commit a1cc1ba
Showing 3 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/ia64/include/asm/fpu.h
Original file line number Diff line number Diff line change
@@ -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 */
1 change: 1 addition & 0 deletions arch/ia64/include/asm/xen/hypervisor.h
Original file line number Diff line number Diff line change
@@ -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 */
8 changes: 8 additions & 0 deletions arch/ia64/kernel/dma-mapping.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit a1cc1ba

Please sign in to comment.