From 6e70d56d647230f96cca760007a1c15968440226 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 5 Dec 2008 10:22:13 -0800 Subject: [PATCH] Refresh linux-have-fm --- .topdeps | 4 +--- .topmsg | 17 ++--------------- zfs/lib/libzpool/zfs_fm.c | 4 ++-- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/.topdeps b/.topdeps index 607c231780..7f16cbcdd5 100644 --- a/.topdeps +++ b/.topdeps @@ -1,3 +1 @@ -gcc-branch -fix-branch -feature-branch +zfs-branch diff --git a/.topmsg b/.topmsg index e9722e1075..03aa8420e8 100644 --- a/.topmsg +++ b/.topmsg @@ -1,19 +1,6 @@ From: Brian Behlendorf -Subject: [PATCH] zfs branch +Subject: [PATCH] linux have fm -Merged result of all changes which are relevant to both Solaris -and Linux builds of the ZFS code. These are changes where there -is a reasonable chance they will be accepted upstream. - -Additionally, since this is effectively the root of the linux -ZFS tree the core linux build system is added here. This -includes autogen.sh, configure.ac, m4 macros, some scripts/*, -and makefiles for all the core ZFS components. Linux-only -features which require tweaks to the build system should appear -on the relevant topic branches. All autotools products which -result from autogen.sh are commited to the linux-configure-branch. - -This branch also contains the META, ChangeLog, AUTHORS, -README, and GIT files. +Use fm_* if HAVE_FM defined Signed-off-by: Brian Behlendorf diff --git a/zfs/lib/libzpool/zfs_fm.c b/zfs/lib/libzpool/zfs_fm.c index 236d69e7e6..bd06e37d1a 100644 --- a/zfs/lib/libzpool/zfs_fm.c +++ b/zfs/lib/libzpool/zfs_fm.c @@ -92,7 +92,7 @@ void zfs_ereport_post(const char *subclass, spa_t *spa, vdev_t *vd, zio_t *zio, uint64_t stateoroffset, uint64_t size) { -#ifdef _KERNEL +#if defined(_KERNEL) && defined(HAVE_FM) nvlist_t *ereport, *detector; uint64_t ena; char class[64]; @@ -315,7 +315,7 @@ zfs_ereport_post(const char *subclass, spa_t *spa, vdev_t *vd, zio_t *zio, static void zfs_post_common(spa_t *spa, vdev_t *vd, const char *name) { -#ifdef _KERNEL +#if defined(_KERNEL) && defined(HAVE_FM) nvlist_t *resource; char class[64];