diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 12:46:14 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-01-15 12:46:14 -0500 |
| commit | 0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch) | |
| tree | 1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /include/linux/lockd/debug.h | |
| parent | 0c3e99437a66e4c869c60c2398449e6d98f3a988 (diff) | |
| parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'include/linux/lockd/debug.h')
| -rw-r--r-- | include/linux/lockd/debug.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/lockd/debug.h b/include/linux/lockd/debug.h index 257d3779f2ab..0ca8109934e4 100644 --- a/include/linux/lockd/debug.h +++ b/include/linux/lockd/debug.h | |||
| @@ -17,12 +17,8 @@ | |||
| 17 | * Enable lockd debugging. | 17 | * Enable lockd debugging. |
| 18 | * Requires RPC_DEBUG. | 18 | * Requires RPC_DEBUG. |
| 19 | */ | 19 | */ |
| 20 | #ifdef RPC_DEBUG | ||
| 21 | # define LOCKD_DEBUG 1 | ||
| 22 | #endif | ||
| 23 | |||
| 24 | #undef ifdebug | 20 | #undef ifdebug |
| 25 | #if defined(RPC_DEBUG) && defined(LOCKD_DEBUG) | 21 | #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) |
| 26 | # define ifdebug(flag) if (unlikely(nlm_debug & NLMDBG_##flag)) | 22 | # define ifdebug(flag) if (unlikely(nlm_debug & NLMDBG_##flag)) |
| 27 | #else | 23 | #else |
| 28 | # define ifdebug(flag) if (0) | 24 | # define ifdebug(flag) if (0) |