aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/setup.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-01-10 12:23:29 -0500
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-15 16:39:12 -0500
commite119bfff1f102f8d1505910cd6c09df55c776b43 (patch)
tree9965ed156096521c3106f7451b758d2bf08f0c68 /arch/arm/kernel/setup.c
parent373b32abf9b33616ad94283461bb2ab49e8371d5 (diff)
ARM: Move creation of /proc/cpu out of alignment.c
Always creating this directory avoids other users having to jump through silly hoops when they want to share this directory. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/setup.c')
-rw-r--r--arch/arm/kernel/setup.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index c6c57b640b6..5357e48f2c3 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -24,6 +24,7 @@
24#include <linux/interrupt.h> 24#include <linux/interrupt.h>
25#include <linux/smp.h> 25#include <linux/smp.h>
26#include <linux/fs.h> 26#include <linux/fs.h>
27#include <linux/proc_fs.h>
27 28
28#include <asm/unified.h> 29#include <asm/unified.h>
29#include <asm/cpu.h> 30#include <asm/cpu.h>
@@ -782,9 +783,21 @@ static int __init topology_init(void)
782 783
783 return 0; 784 return 0;
784} 785}
785
786subsys_initcall(topology_init); 786subsys_initcall(topology_init);
787 787
788#ifdef CONFIG_HAVE_PROC_CPU
789static int __init proc_cpu_init(void)
790{
791 struct proc_dir_entry *res;
792
793 res = proc_mkdir("cpu", NULL);
794 if (!res)
795 return -ENOMEM;
796 return 0;
797}
798fs_initcall(proc_cpu_init);
799#endif
800
788static const char *hwcap_str[] = { 801static const char *hwcap_str[] = {
789 "swp", 802 "swp",
790 "half", 803 "half",