diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 15:52:03 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-09 15:52:03 (GMT) |
| commit | e411f2dda48c81c556c802d4430717950cf088fd (patch) | |
| tree | 9c572940fe081cf84280b16c61e3ee2574ccd3fc | |
| parent | 79907d89c397b8bc2e05b347ec94e928ea919d33 (diff) | |
| parent | fcdcddbcbbd39a3363bd48414bfe44553b6d698a (diff) | |
| download | linux-e411f2dda48c81c556c802d4430717950cf088fd.tar.xz | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Fix sg_dma_len() regression
microblaze: Define ARCH_SLAB_MINALIGN to fix slab crash
| -rw-r--r-- | arch/microblaze/include/asm/page.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/kernel/dma.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/page.h b/arch/microblaze/include/asm/page.h index de493f8..464ff32 100644 --- a/arch/microblaze/include/asm/page.h +++ b/arch/microblaze/include/asm/page.h @@ -34,6 +34,8 @@ /* MS be sure that SLAB allocates aligned objects */ #define ARCH_KMALLOC_MINALIGN L1_CACHE_BYTES +#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES + #define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1))) #define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1))) diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c index 9dcd90b..79c7465 100644 --- a/arch/microblaze/kernel/dma.c +++ b/arch/microblaze/kernel/dma.c @@ -90,7 +90,6 @@ static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl, /* FIXME this part of code is untested */ for_each_sg(sgl, sg, nents, i) { sg->dma_address = sg_phys(sg) + get_dma_direct_offset(dev); - sg->dma_length = sg->length; __dma_sync_page(page_to_phys(sg_page(sg)), sg->offset, sg->length, direction); } |