Merge 3.15-rc6 into driver-core-next

We want the kernfs fixes in this branch as well for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-05-23 10:13:53 +09:00
commit cbfef53360
724 changed files with 8057 additions and 4802 deletions

View file

@ -23,7 +23,7 @@ static void __dump_stack(void)
#ifdef CONFIG_SMP
static atomic_t dump_lock = ATOMIC_INIT(-1);
asmlinkage void dump_stack(void)
asmlinkage __visible void dump_stack(void)
{
int was_locked;
int old;
@ -55,7 +55,7 @@ retry:
preempt_enable();
}
#else
asmlinkage void dump_stack(void)
asmlinkage __visible void dump_stack(void)
{
__dump_stack();
}