patch-2.3.99-pre6 linux/arch/ppc/kernel/irq.c

• Lines: 61
• Date: Mon Apr 24 13:39:36 2000
• Orig file: v2.3.99-pre5/linux/arch/ppc/kernel/irq.c
• Orig date: Fri Mar 10 16:40:40 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/arch/ppc/kernel/irq.c linux/arch/ppc/kernel/irq.c
@@ -237,13 +237,13 @@
 		if ( !action || !action->handler )
 			continue;
 		len += sprintf(buf+len, "%3d: ", i);		
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 		for (j = 0; j < smp_num_cpus; j++)
 			len += sprintf(buf+len, "%10u ",
 				kstat.irqs[cpu_logical_map(j)][i]);
 #else		
 		len += sprintf(buf+len, "%10u ", kstat_irqs(i));
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 		if ( irq_desc[i].handler )		
 			len += sprintf(buf+len, " %s ", irq_desc[i].handler->typename );
 		else
@@ -254,7 +254,7 @@
 		}
 		len += sprintf(buf+len, "\n");
 	}
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 	/* should this be per processor send/receive? */
 	len += sprintf(buf+len, "IPI: %10lu\n", ipi_count);
 #endif		
@@ -343,7 +343,7 @@
 	ppc_md.init_IRQ();
 }
 
-#ifdef __SMP__
+#ifdef CONFIG_SMP
 unsigned char global_irq_holder = NO_PROC_ID;
 unsigned volatile int global_irq_lock;
 atomic_t global_irq_count;
@@ -611,7 +611,7 @@
 	}
 	}
 }
-#endif /* __SMP__ */
+#endif /* CONFIG_SMP */
 
 static struct proc_dir_entry * root_irq_dir;
 static struct proc_dir_entry * irq_dir [NR_IRQS];
@@ -733,7 +733,7 @@
 	irq_dir[irq] = proc_mkdir(name, root_irq_dir);
 
 	/* create /proc/irq/1234/smp_affinity */
-	entry = create_proc_entry("smp_affinity", 0700, irq_dir[irq]);
+	entry = create_proc_entry("smp_affinity", 0600, irq_dir[irq]);
 
 	entry->nlink = 1;
 	entry->data = (void *)irq;
@@ -754,7 +754,7 @@
 	root_irq_dir = proc_mkdir("irq", 0);
 
 	/* create /proc/irq/prof_cpu_mask */
-	entry = create_proc_entry("prof_cpu_mask", 0700, root_irq_dir);
+	entry = create_proc_entry("prof_cpu_mask", 0600, root_irq_dir);
 
 	entry->nlink = 1;
 	entry->data = (void *)&prof_cpu_mask;