diff options
| author | Rafael J. Wysocki <[email protected]> | 2012-07-18 21:58:24 +0000 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2012-07-18 21:58:24 +0000 |
| commit | 823d93640927d739f7c918b73fe5ec494fb27e17 (patch) | |
| tree | dea028ddd214541b76c1c26f5f21ddc46157e67e /lib/dma-debug.c | |
| parent | PM / Sleep: Add missing static storage class specifiers in main.c (diff) | |
| parent | PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND (diff) | |
| download | kernel-823d93640927d739f7c918b73fe5ec494fb27e17.tar.gz kernel-823d93640927d739f7c918b73fe5ec494fb27e17.zip | |
Merge branch 'fixes' into pm-sleep
The 'fixes' branch contains material the next commit depends on.
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); static DEFINE_SPINLOCK(free_entries_lock); /* Global disable flag - will be set in case of an error */ -static bool global_disable __read_mostly; +static u32 global_disable __read_mostly; /* Global error count */ static u32 error_count; @@ -657,7 +657,7 @@ static int dma_debug_fs_init(void) global_disable_dent = debugfs_create_bool("disabled", 0444, dma_debug_dent, - (u32 *)&global_disable); + &global_disable); if (!global_disable_dent) goto out_err; |