diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /include/linux/lockd/debug.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'include/linux/lockd/debug.h')
| -rw-r--r-- | include/linux/lockd/debug.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/lockd/debug.h b/include/linux/lockd/debug.h index 34b2b7f33c3b..257d3779f2ab 100644 --- a/include/linux/lockd/debug.h +++ b/include/linux/lockd/debug.h | |||
| @@ -44,14 +44,4 @@ | |||
| 44 | #define NLMDBG_XDR 0x0100 | 44 | #define NLMDBG_XDR 0x0100 |
| 45 | #define NLMDBG_ALL 0x7fff | 45 | #define NLMDBG_ALL 0x7fff |
| 46 | 46 | ||
| 47 | |||
| 48 | /* | ||
| 49 | * Support for printing NLM cookies in dprintk() | ||
| 50 | */ | ||
| 51 | #ifdef RPC_DEBUG | ||
| 52 | struct nlm_cookie; | ||
| 53 | /* Call this function with the BKL held (it uses a static buffer) */ | ||
| 54 | extern const char *nlmdbg_cookie2a(const struct nlm_cookie *); | ||
| 55 | #endif | ||
| 56 | |||
| 57 | #endif /* LINUX_LOCKD_DEBUG_H */ | 47 | #endif /* LINUX_LOCKD_DEBUG_H */ |