diff options
| author | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-03-07 18:55:06 -0500 |
| commit | 1cc26bada9f6807814806db2f0d78792eecdac71 (patch) | |
| tree | 5509b5139db04af6c13db0a580c84116a4a54039 /include/linux/lockd/debug.h | |
| parent | eae61f3c829439f8f9121b5cd48a14be04df451f (diff) | |
| parent | 214d93b02c4fe93638ad268613c9702a81ed9192 (diff) | |
Merge branch 'master'; commit 'v2.6.38-rc7' into next
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 */ |