Merge commit 'refs/top-bases/linux-have-libdiskmgt' into linux-have-libdiskmgt
This commit is contained in:
commit
8fca960b4e
|
@ -168,6 +168,11 @@ _NOTE(CONSTCOND) } while (0)
|
||||||
* existence for their counterparts in libzpool.
|
* existence for their counterparts in libzpool.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifdef DTRACE_PROBE
|
||||||
|
#undef DTRACE_PROBE
|
||||||
|
#define DTRACE_PROBE(a) ((void)0)
|
||||||
|
#endif /* DTRACE_PROBE */
|
||||||
|
|
||||||
#ifdef DTRACE_PROBE1
|
#ifdef DTRACE_PROBE1
|
||||||
#undef DTRACE_PROBE1
|
#undef DTRACE_PROBE1
|
||||||
#define DTRACE_PROBE1(a, b, c) ((void)0)
|
#define DTRACE_PROBE1(a, b, c) ((void)0)
|
||||||
|
@ -450,6 +455,8 @@ extern void delay(clock_t ticks);
|
||||||
#define kcred NULL
|
#define kcred NULL
|
||||||
#define CRED() NULL
|
#define CRED() NULL
|
||||||
|
|
||||||
|
#define ptob(x) ((x) * PAGESIZE)
|
||||||
|
|
||||||
extern uint64_t physmem;
|
extern uint64_t physmem;
|
||||||
|
|
||||||
extern int highbit(ulong_t i);
|
extern int highbit(ulong_t i);
|
||||||
|
|
Loading…
Reference in New Issue