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

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

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
parents 79907d89 fcdcddbc

arch/microblaze/include/asm/page.h

+2 −0
Original line number Diff line number Diff line
@@ -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)))

arch/microblaze/kernel/dma.c

+0 −1
Original line number Diff line number Diff line
@@ -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);

	}