2.5.38 s390 fixes: 24_proc_misc.
Subsystems (3)
PATCH 1/1 2.5.38 s390 fixes: 24_proc_misc.
Don't create /proc/interrupts on s390.
drivers/s390/cio/proc.c +0 -26
@@ -17,7 +17,6 @@#include <linux/config.h> #include <linux/init.h> #include <linux/proc_fs.h> -#include <linux/seq_file.h> #include <asm/io.h> #include <asm/irq.h>
@@ -31,31 +30,6 @@static int chan_proc_init (void ); -int show_interrupts (struct seq_file *p,void *v) -{ -int i, j; - -seq_puts (p," " ); - -for (j=0 ; j<num_online_cpus (); j++) -seq_printf (p,"CPU%d " ,j); - -seq_putc (p,'\n' ); - -for (i =0 ; i <NR_IRQS ; i++) { -if (ioinfo[i] ==INVALID_STORAGE_AREA ) -continue ; - -seq_printf (p,"%3d: " ,i); -seq_printf (p," %s" , ioinfo[i]->irq_desc.name); - -seq_putc (p,'\n' ); - - }/* endfor */ - -return 0 ; -} -/* * Display info on subchannels in /proc/subchannels. * Adapted from procfs stuff in dasd.c by Cornelia Huck, 02/28/01.
fs/proc/proc_misc.c +4 -0
@@ -418,6 +418,7 @@return proc_calc_metrics (page, start, off, count, eof, len); } +#if !defined(CONFIG_ARCH_S390 )extern int show_interrupts (struct seq_file *p,void *v);static int interrupts_open (struct inode *inode,struct file *file) {
@@ -447,6 +448,7 @@ llseek: seq_lseek, release: single_release, }; +#endif static int filesystems_read_proc (char *page,char **start,off_t off,int count,int *eof,void *data)
@@ -629,7 +631,9 @@ entry->proc_fops = &proc_kmsg_operations;create_seq_entry ("cpuinfo" ,0 , &proc_cpuinfo_operations);create_seq_entry ("partitions" ,0 , &proc_partitions_operations); +#if !defined(CONFIG_ARCH_S390 )create_seq_entry ("interrupts" ,0 , &proc_interrupts_operations); +#endif create_seq_entry ("slabinfo" ,S_IWUSR |S_IRUGO ,&proc_slabinfo_operations);#ifdef CONFIG_MODULES create_seq_entry ("modules" ,0 , &proc_modules_operations);