Commit 55dff522 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] Move init_irq_proc to the other irq related functions. 



Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 62d0cfcb

arch/s390/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ EXTRA_AFLAGS := -traditional 


obj-y	:=  bitmap.o traps.o time.o process.o reset.o \

            setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \

	    semaphore.o s390_ext.o debug.o profile.o irq.o ipl.o

	    semaphore.o s390_ext.o debug.o irq.o ipl.o



obj-y	+= $(if $(CONFIG_64BIT),entry64.o,entry.o)

obj-y	+= $(if $(CONFIG_64BIT),reipl64.o,reipl.o)

arch/s390/kernel/irq.c

+12 −3
Original line number Diff line number Diff line 
/*

 *  arch/s390/kernel/irq.c

 *

 *  S390 version

 *    Copyright (C) 2004 IBM Deutschland Entwicklung GmbH, IBM Corporation

 *    Copyright IBM Corp. 2004,2007

 *    Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com),

 *		 Thomas Spatzier (tspat@de.ibm.com)

 *

 * This file contains interrupt related functions.

 */
@@ -14,6 +14,8 @@ 
#include <linux/interrupt.h>

#include <linux/seq_file.h>

#include <linux/cpu.h>

#include <linux/proc_fs.h>

#include <linux/profile.h>



/*

 * show_interrupts is needed by /proc/interrupts.
@@ -93,5 +95,12 @@ asmlinkage void do_softirq(void) 


	local_irq_restore(flags);

}



EXPORT_SYMBOL(do_softirq);



void init_irq_proc(void)

{

	struct proc_dir_entry *root_irq_dir;



	root_irq_dir = proc_mkdir("irq", NULL);

	create_prof_cpu_mask(root_irq_dir);

}

arch/s390/kernel/profile.c

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
/*

 * arch/s390/kernel/profile.c

 *

 * Copyright (C) 2003 IBM Deutschland Entwicklung GmbH, IBM Corporation

 * Author(s): Thomas Spatzier (tspat@de.ibm.com)

 *

 */

#include <linux/proc_fs.h>

#include <linux/profile.h>



static struct proc_dir_entry * root_irq_dir;



void init_irq_proc(void)

{

	/* create /proc/irq */

	root_irq_dir = proc_mkdir("irq", NULL);



	/* create /proc/irq/prof_cpu_mask */

	create_prof_cpu_mask(root_irq_dir);

}