sh: Consolidate slab/kmalloc minalign values.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
parent
9b01bd9ee6
commit
01fed9311a
|
@ -157,8 +157,22 @@ typedef struct { unsigned long pgd; } pgd_t;
|
||||||
* Slub defaults to 8-byte alignment, we're only interested in 4.
|
* Slub defaults to 8-byte alignment, we're only interested in 4.
|
||||||
* Slab defaults to BYTES_PER_WORD, which ends up being the same anyways.
|
* Slab defaults to BYTES_PER_WORD, which ends up being the same anyways.
|
||||||
*/
|
*/
|
||||||
|
#ifdef CONFIG_SUPERH32
|
||||||
#define ARCH_KMALLOC_MINALIGN 4
|
#define ARCH_KMALLOC_MINALIGN 4
|
||||||
#define ARCH_SLAB_MINALIGN 4
|
#define ARCH_SLAB_MINALIGN 4
|
||||||
|
#else
|
||||||
|
/* If gcc inlines memset, it will use st.q instructions. Therefore, we need
|
||||||
|
kmalloc allocations to be 8-byte aligned. Without this, the alignment
|
||||||
|
becomes BYTE_PER_WORD i.e. only 4 (since sizeof(long)==sizeof(void*)==4 on
|
||||||
|
sh64 at the moment). */
|
||||||
|
#define ARCH_KMALLOC_MINALIGN 8
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We want 8-byte alignment for the slab caches as well, otherwise we have
|
||||||
|
* the same BYTES_PER_WORD (sizeof(void *)) min align in kmem_cache_create().
|
||||||
|
*/
|
||||||
|
#define ARCH_SLAB_MINALIGN 8
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __KERNEL__ */
|
#endif /* __KERNEL__ */
|
||||||
#endif /* __ASM_SH_PAGE_H */
|
#endif /* __ASM_SH_PAGE_H */
|
||||||
|
|
|
@ -297,18 +297,6 @@ struct exception_table_entry
|
||||||
|
|
||||||
#define ARCH_HAS_SEARCH_EXTABLE
|
#define ARCH_HAS_SEARCH_EXTABLE
|
||||||
|
|
||||||
/* If gcc inlines memset, it will use st.q instructions. Therefore, we need
|
|
||||||
kmalloc allocations to be 8-byte aligned. Without this, the alignment
|
|
||||||
becomes BYTE_PER_WORD i.e. only 4 (since sizeof(long)==sizeof(void*)==4 on
|
|
||||||
sh64 at the moment). */
|
|
||||||
#define ARCH_KMALLOC_MINALIGN 8
|
|
||||||
|
|
||||||
/*
|
|
||||||
* We want 8-byte alignment for the slab caches as well, otherwise we have
|
|
||||||
* the same BYTES_PER_WORD (sizeof(void *)) min align in kmem_cache_create().
|
|
||||||
*/
|
|
||||||
#define ARCH_SLAB_MINALIGN 8
|
|
||||||
|
|
||||||
/* Returns 0 if exception not found and fixup.unit otherwise. */
|
/* Returns 0 if exception not found and fixup.unit otherwise. */
|
||||||
extern unsigned long search_exception_table(unsigned long addr);
|
extern unsigned long search_exception_table(unsigned long addr);
|
||||||
extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
|
extern const struct exception_table_entry *search_exception_tables (unsigned long addr);
|
||||||
|
|
Loading…
Reference in New Issue