svn commit: r367566 - stable/12/sys/compat/linuxkpi/common/include/linux

[Hans Petter Selasky]

Author: hselasky
Date: Tue Nov 10 13:36:07 2020
New Revision: 367566
URL: https://svnweb.freebsd.org/changeset/base/367566

Log:
  MFC r366751:
  Remove ifdefs around IS_ALIGNED() definition in the LinuxKPI.
  
  Discussed with:		manu@
  Sponsored by:		Mellanox Technologies // NVIDIA Networking

Modified:
  stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h	Tue Nov 10 13:33:39 2020	(r367565)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h	Tue Nov 10 13:36:07 2020	(r367566)
@@ -135,10 +135,7 @@ extern const volatile int lkpi_build_bug_on_zero;
 #define	ALIGN(x, y)		roundup2((x), (y))
 #undef PTR_ALIGN
 #define	PTR_ALIGN(p, a)		((__typeof(p))ALIGN((uintptr_t)(p), (a)))
-#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 50000
-/* Moved from linuxkpi_gplv2 */
 #define	IS_ALIGNED(x, a)	(((x) & ((__typeof(x))(a) - 1)) == 0)
-#endif
 #define	DIV_ROUND_UP(x, n)	howmany(x, n)
 #define	__KERNEL_DIV_ROUND_UP(x, n)	howmany(x, n)
 #define	DIV_ROUND_UP_ULL(x, n)	DIV_ROUND_UP((unsigned long long)(x), (n))