diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-16 12:01:42 -0400 |
| commit | 8626e4a42675ff9903f7d4fbf14d8ebc11b5926c (patch) | |
| tree | c631dfe2854cb1382a5d8f5aa11b071762ddf27d /lib/dma-debug.c | |
| parent | a8d8f02cf0c379693762107afe812b9e52090e39 (diff) | |
| parent | 9249e17fe094d853d1ef7475dd559a2cc7e23d42 (diff) | |
Merge commit '9249e17fe094d853d1ef7475dd559a2cc7e23d42' into nfs-for-3.6
Resolve conflicts with the VFS atomic open and sget changes.
Conflicts:
fs/nfs/nfs4proc.c
Diffstat (limited to 'lib/dma-debug.c')
| -rw-r--r-- | lib/dma-debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/dma-debug.c b/lib/dma-debug.c index 518aea714d21..66ce41489133 100644 --- a/lib/dma-debug.c +++ b/lib/dma-debug.c | |||
| @@ -78,7 +78,7 @@ static LIST_HEAD(free_entries); | |||
| 78 | static DEFINE_SPINLOCK(free_entries_lock); | 78 | static DEFINE_SPINLOCK(free_entries_lock); |
| 79 | 79 | ||
| 80 | /* Global disable flag - will be set in case of an error */ | 80 | /* Global disable flag - will be set in case of an error */ |
| 81 | static bool global_disable __read_mostly; | 81 | static u32 global_disable __read_mostly; |
| 82 | 82 | ||
| 83 | /* Global error count */ | 83 | /* Global error count */ |
| 84 | static u32 error_count; | 84 | static u32 error_count; |
| @@ -657,7 +657,7 @@ static int dma_debug_fs_init(void) | |||
| 657 | 657 | ||
| 658 | global_disable_dent = debugfs_create_bool("disabled", 0444, | 658 | global_disable_dent = debugfs_create_bool("disabled", 0444, |
| 659 | dma_debug_dent, | 659 | dma_debug_dent, |
| 660 | (u32 *)&global_disable); | 660 | &global_disable); |
| 661 | if (!global_disable_dent) | 661 | if (!global_disable_dent) |
| 662 | goto out_err; | 662 | goto out_err; |
| 663 | 663 | ||