diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:53:00 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-03-01 11:53:00 +1100 |
| commit | ab0e4a6952068ac6a3a0818ce02c3daba09e8853 (patch) | |
| tree | 991818f2c6a4812d9fe4f445813d681f1e9c194e /arch | |
| parent | aca08906955e8853519319705e57341a0420a8fc (diff) | |
| parent | 1a57a9094e15936d26f1782e681e7b567761de3e (diff) | |
Merge remote-tracking branch 'ia64/test'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/include/asm/dma-mapping.h | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/mca.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h index a2e7368a0150..4336d080b241 100644 --- a/arch/ia64/include/asm/dma-mapping.h +++ b/arch/ia64/include/asm/dma-mapping.h @@ -12,6 +12,8 @@ #define ARCH_HAS_DMA_GET_REQUIRED_MASK +#define DMA_ERROR_CODE 0 + extern struct dma_map_ops *dma_ops; extern struct ia64_machine_vector ia64_mv; extern void set_iommu_machvec(void); diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c index 1753f6a30d55..e50d54e97f06 100644 --- a/arch/ia64/kernel/mca.c +++ b/arch/ia64/kernel/mca.c @@ -582,6 +582,8 @@ out: /* Get the CPE error record and log it */ ia64_mca_log_sal_error_record(SAL_INFO_TYPE_CPE); + local_irq_disable(); + return IRQ_HANDLED; } |