Commit e119bfff authored by Russell King's avatar Russell King
Browse files

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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 373b32ab

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -52,6 +52,9 @@ config HAVE_TCM 
	bool

	select GENERIC_ALLOCATOR



config HAVE_PROC_CPU

	bool



config NO_IOPORT

	bool
@@ -1229,6 +1232,7 @@ config ALIGNMENT_TRAP 
	bool

	depends on CPU_CP15_MMU

	default y if !ARCH_EBSA110

	select HAVE_PROC_CPU if PROC_FS

	help

	  ARM processors cannot fetch/store information which is not

	  naturally aligned on the bus, i.e., a 4 byte fetch must start at an

arch/arm/kernel/setup.c

+14 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/interrupt.h>

#include <linux/smp.h>

#include <linux/fs.h>

#include <linux/proc_fs.h>



#include <asm/unified.h>

#include <asm/cpu.h>
@@ -782,9 +783,21 @@ static int __init topology_init(void) 


	return 0;

}



subsys_initcall(topology_init);



#ifdef CONFIG_HAVE_PROC_CPU

static int __init proc_cpu_init(void)

{

	struct proc_dir_entry *res;



	res = proc_mkdir("cpu", NULL);

	if (!res)

		return -ENOMEM;

	return 0;

}

fs_initcall(proc_cpu_init);

#endif



static const char *hwcap_str[] = {

	"swp",

	"half",

arch/arm/mm/alignment.c

+1 −5
Original line number Diff line number Diff line
@@ -898,11 +898,7 @@ static int __init alignment_init(void) 
#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *res;



	res = proc_mkdir("cpu", NULL);

	if (!res)

		return -ENOMEM;



	res = create_proc_entry("alignment", S_IWUSR | S_IRUGO, res);

	res = create_proc_entry("cpu/alignment", S_IWUSR | S_IRUGO, NULL);

	if (!res)

		return -ENOMEM;