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

Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch 

Conflicts:
	lib/libzpool/include/sys/zfs_context.h
This commit is contained in:
Brian Behlendorf 2010-05-28 22:21:07 -07:00
parent 2d6e5286eb e776fc7fa7
commit 61f5fa262e
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libzpool/include/sys/zfs_context.h
View File

@ -110,7 +110,6 @@ extern void vpanic(const char *, __va_list);
#define fm_panic panic #define fm_panic panic
/* /*
* DTrace SDT probes have different signatures in userland than they do in * DTrace SDT probes have different signatures in userland than they do in
* kernel. If they're being used in kernel code, re-define them out of * kernel. If they're being used in kernel code, re-define them out of