Skip to content

Commit 4ea57ce

Browse files
ctmarinasakpm00
authored andcommitted
microblaze: move the ARCH_{DMA,SLAB}_MINALIGN definitions to asm/cache.h
The microblaze architecture defines ARCH_DMA_MINALIGN in asm/page.h. Move it to asm/cache.h to allow a generic ARCH_DMA_MINALIGN definition in linux/cache.h without redefine errors/warnings. While at it, also move ARCH_SLAB_MINALIGN to asm/cache.h for consistency. Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]> Cc: Michal Simek <[email protected]> Cc: Christophe Leroy <[email protected]> Cc: John Paul Adrian Glaubitz <[email protected]> Cc: kernel test robot <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Nicholas Piggin <[email protected]> Cc: Rich Felker <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Yoshinori Sato <[email protected]> Signed-off-by: Andrew Morton <[email protected]>
1 parent 78615c4 commit 4ea57ce

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

arch/microblaze/include/asm/cache.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@
1818

1919
#define SMP_CACHE_BYTES L1_CACHE_BYTES
2020

21+
/* MS be sure that SLAB allocates aligned objects */
22+
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
23+
24+
#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
25+
2126
#endif /* _ASM_MICROBLAZE_CACHE_H */

arch/microblaze/include/asm/page.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030

3131
#ifndef __ASSEMBLY__
3232

33-
/* MS be sure that SLAB allocates aligned objects */
34-
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
35-
36-
#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
37-
3833
/*
3934
* PAGE_OFFSET -- the first address of the first page of memory. With MMU
4035
* it is set to the kernel start address (aligned on a page boundary).

0 commit comments

Comments
 (0)