Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2010-06-29 16:58:19 -07:00
parent 165c121b67 f28ca65b92
commit 382f1c338c
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ztest/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += -Wframe-larger-than=1024 AM_CFLAGS += $(FRAME_LARGER_THAN)
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libspl/include \ -I${top_srcdir}/lib/libspl/include \

22
config/user-frame-larger-than.m4 Normal file
View File

@ -0,0 +1,22 @@
dnl #
dnl # Check if gcc supports -Wframe-larger-than=<size> option.
dnl #
AC_DEFUN([ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN], [
AC_MSG_CHECKING([for -Wframe-larger-than=<size> support])
saved_flags="$CFLAGS"
CFLAGS="$CFLAGS -Wframe-larger-than=1024"
AC_RUN_IFELSE(AC_LANG_PROGRAM( [], []),
[
FRAME_LARGER_THAN=-Wframe-larger-than=1024
AC_MSG_RESULT([yes])
],
[
FRAME_LARGER_THAN=
AC_MSG_RESULT([no])
])
CFLAGS="$saved_flags"
AC_SUBST([FRAME_LARGER_THAN])
])

1
config/user.m4
View File

@ -8,4 +8,5 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
ZFS_AC_CONFIG_USER_ZLIB ZFS_AC_CONFIG_USER_ZLIB
ZFS_AC_CONFIG_USER_LIBUUID ZFS_AC_CONFIG_USER_LIBUUID
ZFS_AC_CONFIG_USER_LIBBLKID ZFS_AC_CONFIG_USER_LIBBLKID
ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
]) ])

2
lib/libzpool/Makefile.am
View File

@ -1,6 +1,6 @@
include $(top_srcdir)/config/Rules.am include $(top_srcdir)/config/Rules.am
AM_CFLAGS += -Wframe-larger-than=1024 AM_CFLAGS += $(FRAME_LARGER_THAN)
SUBDIRS = include SUBDIRS = include
DEFAULT_INCLUDES += \ DEFAULT_INCLUDES += \

2
module/zfs/dmu_traverse.c
View File

@ -77,9 +77,7 @@ struct traverse_visitbp_data {
int tv_lasterr; int tv_lasterr;
int tv_i; int tv_i;
int tv_epb; int tv_epb;
#ifdef DEBUG
int tv_depth; int tv_depth;
#endif
}; };
static inline int traverse_visitbp(struct traverse_data *td, const static inline int traverse_visitbp(struct traverse_data *td, const