No longer need this compat file, we can use the upstream version
of the function.
Signed-off-by: Alex Wang <alexw@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
echo '#define $1 1' >> datapath/linux/kcompat.h.new
])
echo '#define $1 1' >> datapath/linux/kcompat.h.new
])
-AC_DEFUN([OVS_CHECK_LOG2_H], [
- AC_MSG_CHECKING([for $KSRC/include/linux/log2.h])
- if test -e $KSRC/include/linux/log2.h; then
- AC_MSG_RESULT([yes])
- OVS_DEFINE([HAVE_LOG2_H])
- else
- AC_MSG_RESULT([no])
- fi
-])
-
dnl OVS_CHECK_LINUX_COMPAT
dnl
dnl Runs various Autoconf checks on the Linux 2.6 kernel source in
dnl OVS_CHECK_LINUX_COMPAT
dnl
dnl Runs various Autoconf checks on the Linux 2.6 kernel source in
OVS_GREP_IFELSE([$KSRC/include/uapi/linux/netdevice.h], [NET_NAME_UNKNOWN],
[OVS_DEFINE([HAVE_NET_NAME_UNKNOWN])])
OVS_GREP_IFELSE([$KSRC/include/uapi/linux/netdevice.h], [NET_NAME_UNKNOWN],
[OVS_DEFINE([HAVE_NET_NAME_UNKNOWN])])
if cmp -s datapath/linux/kcompat.h.new \
datapath/linux/kcompat.h >/dev/null 2>&1; then
rm datapath/linux/kcompat.h.new
if cmp -s datapath/linux/kcompat.h.new \
datapath/linux/kcompat.h >/dev/null 2>&1; then
rm datapath/linux/kcompat.h.new
linux/compat/include/linux/kconfig.h \
linux/compat/include/linux/kernel.h \
linux/compat/include/linux/list.h \
linux/compat/include/linux/kconfig.h \
linux/compat/include/linux/kernel.h \
linux/compat/include/linux/list.h \
- linux/compat/include/linux/log2.h \
linux/compat/include/linux/mpls.h \
linux/compat/include/linux/net.h \
linux/compat/include/linux/random.h \
linux/compat/include/linux/mpls.h \
linux/compat/include/linux/net.h \
linux/compat/include/linux/random.h \
+++ /dev/null
-#ifndef __LINUX_LOG2_WRAPPER
-#define __LINUX_LOG2_WRAPPER
-
-#ifdef HAVE_LOG2_H
-#include_next <linux/log2.h>
-#else
-/* This is very stripped down because log2.h has far too many dependencies. */
-
-extern __attribute__((const, noreturn))
-int ____ilog2_NaN(void);
-
-#define ilog2(n) ((n) == 4 ? 2 : \
- (n) == 8 ? 3 : \
- ____ilog2_NaN())
-#endif
-
-#endif