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 2008-12-19 09:54:26 -08:00
parent ccbc8aee4e 2d0ae2710c
commit e60107ab95
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,6 +168,11 @@ _NOTE(CONSTCOND) } while (0)
* existence for their counterparts in libzpool.
*/
#ifdef DTRACE_PROBE
#undef DTRACE_PROBE
#define DTRACE_PROBE(a) ((void)0)
#endif /* DTRACE_PROBE */
#ifdef DTRACE_PROBE1
#undef DTRACE_PROBE1
#define DTRACE_PROBE1(a, b, c) ((void)0)
@ -450,6 +455,8 @@ extern void delay(clock_t ticks);
#define kcred NULL
#define CRED() NULL
#define ptob(x) ((x) * PAGESIZE)
extern uint64_t physmem;
extern int highbit(ulong_t i);