diff options
| author | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-07-19 14:17:30 -0400 |
| commit | abaa72d7fd9a20a67b62e6afa0e746e27851dc33 (patch) | |
| tree | ebe4134fcc93a6e205e6004b3e652d7a62281651 /lib | |
| parent | 67da22d23fa6f3324e03bcd0580b914b2e4afbf3 (diff) | |
| parent | 3e4b9459fb0e149c6b74c9e89399a8fc39a92b44 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
Diffstat (limited to 'lib')
| -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 | ||