Skip to content

Commit

Permalink
arm: vfpmodule: Fix warning procfs vfp_bounce reporting
Browse files Browse the repository at this point in the history
 failed Creation of procfs cpu/vfp_bounce fails because we're initialized too
 early. Fix this by creating it on rootfs_initcall as before the NEON patches.

<6>[    0.130770] VFP support v0.3: implementor 51 architecture 64 part
6f varia
nt 2 rev 0
<4>[    0.130795] ------------[ cut here ]------------
<4>[    0.130813] WARNING: at fs/proc/generic.c:323
__xlate_proc_name+0xac/0xcc(
)
<4>[    0.130822] name 'cpu/vfp_bounce'
<4>[    0.130855] [<c010e26c>] (unwind_backtrace+0x0/0x144) from
[<c0a20f58>] (d
ump_stack+0x20/0x24)
<4>[    0.130879] [<c0a20f58>] (dump_stack+0x20/0x24) from [<c019b670>]
(warn_sl
owpath_common+0x58/0x70)
<4>[    0.130899] [<c019b670>] (warn_slowpath_common+0x58/0x70) from
[<c019b704>
] (warn_slowpath_fmt+0x40/0x48)
<4>[    0.130919] [<c019b704>] (warn_slowpath_fmt+0x40/0x48) from
[<c02c2ad8>] (
__xlate_proc_name+0xac/0xcc)
<4>[    0.130938] [<c02c2ad8>] (__xlate_proc_name+0xac/0xcc) from
[<c02c2b50>] (
__proc_create+0x58/0x100)
<4>[    0.130956] [<c02c2b50>] (__proc_create+0x58/0x100) from
[<c02c2ed0>] (pro
c_create_data+0x5c/0xc0)
<4>[    0.130979] [<c02c2ed0>] (proc_create_data+0x5c/0xc0) from
[<c0f03484>] (v
fp_init+0x19c/0x200)
<4>[    0.131000] [<c0f03484>] (vfp_init+0x19c/0x200) from [<c0f00c98>]
(do_one_
initcall+0x98/0x168)
<4>[    0.131020] [<c0f00c98>] (do_one_initcall+0x98/0x168) from
[<c0f00e60>] (k
ernel_init+0xf8/0x1b4)
<4>[    0.131043] [<c0f00e60>] (kernel_init+0xf8/0x1b4) from
[<c01081a0>] (kerne
l_thread_exit+0x0/0x8)
<4>[    0.131076] ---[ end trace ea6d9a9b5e947151 ]---
<3>[    0.131086] Failed to create procfs node for VFP bounce reporting
  • Loading branch information
myfluxi authored and javilonas committed May 27, 2015
1 parent b98475a commit 01ca9f0
Showing 1 changed file with 9 additions and 4 deletions.
13 changes: 9 additions & 4 deletions arch/arm/vfp/vfpmodule.c
Original file line number Diff line number Diff line change
Expand Up @@ -731,9 +731,7 @@ static int __init vfp_init(void)
{
unsigned int vfpsid;
unsigned int cpu_arch = cpu_architecture();
#ifdef CONFIG_PROC_FS
static struct proc_dir_entry *procfs_entry;
#endif

if (cpu_arch >= CPU_ARCH_ARMv6)
on_each_cpu(vfp_enable, NULL, 1);

Expand Down Expand Up @@ -808,14 +806,21 @@ static int __init vfp_init(void)
}
}

return 0;
}

static int __init vfp_rootfs_init(void)
{
#ifdef CONFIG_PROC_FS
static struct proc_dir_entry *procfs_entry;

procfs_entry = proc_create("cpu/vfp_bounce", S_IRUGO, NULL,
&vfp_bounce_fops);
if (!procfs_entry)
pr_err("Failed to create procfs node for VFP bounce reporting\n");
#endif

return 0;
}

core_initcall(vfp_init);
rootfs_initcall(vfp_rootfs_init);

0 comments on commit 01ca9f0

Please sign in to comment.