diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-04 00:49:14 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-04 00:49:14 +0200 |
| commit | 87e8b821ed8db3dab03d96cd542e29666bf210aa (patch) | |
| tree | 0027060473aafbbb125655ba027319c8a1a665fc /arch/um/include/asm | |
| parent | sparc64: Fix array size reported by vmemmap_populate() (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-arm (diff) | |
| download | linux-87e8b821ed8db3dab03d96cd542e29666bf210aa.tar.xz linux-87e8b821ed8db3dab03d96cd542e29666bf210aa.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/um/include/asm')
| -rw-r--r-- | arch/um/include/asm/dma-mapping.h | 8 | ||||
| -rw-r--r-- | arch/um/include/asm/ptrace-generic.h | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/um/include/asm/dma-mapping.h b/arch/um/include/asm/dma-mapping.h index 378de4bbf49f..b948c14a7867 100644 --- a/arch/um/include/asm/dma-mapping.h +++ b/arch/um/include/asm/dma-mapping.h @@ -104,14 +104,6 @@ dma_get_cache_alignment(void) } static inline void -dma_sync_single_range(struct device *dev, dma_addr_t dma_handle, - unsigned long offset, size_t size, - enum dma_data_direction direction) -{ - BUG(); -} - -static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction) { diff --git a/arch/um/include/asm/ptrace-generic.h b/arch/um/include/asm/ptrace-generic.h index 6c8899013c92..2cd899f75a3c 100644 --- a/arch/um/include/asm/ptrace-generic.h +++ b/arch/um/include/asm/ptrace-generic.h @@ -16,6 +16,8 @@ struct pt_regs { struct uml_pt_regs regs; }; +#define arch_has_single_step() (1) + #define EMPTY_REGS { .regs = EMPTY_UML_PT_REGS } #define PT_REGS_IP(r) UPT_IP(&(r)->regs) |