linux-next: build failure after merge of the clk tree

[Stephen Rothwell]

Hi Mike,

After merging the clk tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from arch/x86/include/asm/bug.h:35:0,
                 from include/linux/bug.h:4,
                 from include/linux/cpumask.h:12,
                 from arch/x86/include/asm/cpumask.h:4,
                 from arch/x86/include/asm/msr.h:10,
                 from arch/x86/include/asm/processor.h:20,
                 from arch/x86/include/asm/atomic.h:6,
                 from include/linux/atomic.h:4,
                 from include/linux/debug_locks.h:5,
                 from include/linux/lockdep.h:23,
                 from include/linux/spinlock_types.h:18,
                 from include/linux/mutex.h:15,
                 from include/linux/notifier.h:13,
                 from include/linux/clk.h:17,
                 from include/linux/clk-provider.h:14,
                 from include/linux/clk-private.h:14,
                 from drivers/clk/clk.c:12:
drivers/clk/clk.c: In function 'clk_debug_create_one':
include/linux/lockdep.h:339:51: error: invalid type argument of '->' (have 'struct mutex')
 #define lockdep_is_held(lock) lock_is_held(&(lock)->dep_map)
                                                   ^
include/asm-generic/bug.h:86:25: note: in definition of macro 'WARN_ON'
  int __ret_warn_on = !!(condition);    \
                         ^
include/linux/lockdep.h:362:27: note: in expansion of macro 'lockdep_is_held'
   WARN_ON(debug_locks && !lockdep_is_held(l)); \
                           ^
drivers/clk/clk.c:248:2: note: in expansion of macro 'lockdep_assert_held'
  lockdep_assert_held(clk_debug_lock);
  ^

Caused by commit 9a2027b99994 ("clk: Really fix deadlock with
mmap_sem").  I wonder how this ever built?

I have used the clk tree from next-20141215 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgp6kpvUxn5v9.pgp
Description: OpenPGP digital signature