Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bac49ce42a33f53beb7cf04e9a0600879d6265ca

Authored by David Woodhouse
Committed by Pekka Enberg
1 parent 1f0ce8b3dd
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

mm: Move ARCH_SLAB_MINALIGN and ARCH_KMALLOC_MINALIGN to <linux/slob_def.h> 

Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>

Showing 2 changed files with 8 additions and 8 deletions Side-by-side Diff

include/linux/slob_def.h
Diff comments   View file @ bac49ce
1 1 #ifndef __LINUX_SLOB_DEF_H
2 2 #define __LINUX_SLOB_DEF_H
3 3  
  4 +#ifndef ARCH_KMALLOC_MINALIGN
  5 +#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long)
  6 +#endif
  7 +
  8 +#ifndef ARCH_SLAB_MINALIGN
  9 +#define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
  10 +#endif
  11 +
4 12 void *kmem_cache_alloc_node(struct kmem_cache *, gfp_t flags, int node);
5 13  
6 14 static __always_inline void *kmem_cache_alloc(struct kmem_cache *cachep,
... ... @@ -467,14 +467,6 @@
467 467 * End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
468 468 */
469 469  
470   -#ifndef ARCH_KMALLOC_MINALIGN
471   -#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long)
472   -#endif
473   -
474   -#ifndef ARCH_SLAB_MINALIGN
475   -#define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
476   -#endif
477   -
478 470 void *__kmalloc_node(size_t size, gfp_t gfp, int node)
479 471 {
480 472 unsigned int *m;