Module Name: src
Committed By: uebayasi
Date: Sun Jul 20 15:46:34 UTC 2014
Modified Files:
src/sys/arch/x86/include: intr.h
src/sys/arch/x86/x86: ipi.c
Log Message:
ipifunc[]: Comment IPI constant names for grep'ability. Constify.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/x86/include/intr.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/x86/x86/ipi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/include/intr.h
diff -u src/sys/arch/x86/include/intr.h:1.44 src/sys/arch/x86/include/intr.h:1.45
--- src/sys/arch/x86/include/intr.h:1.44 Sat Mar 29 19:28:30 2014
+++ src/sys/arch/x86/include/intr.h Sun Jul 20 15:46:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.44 2014/03/29 19:28:30 christos Exp $ */
+/* $NetBSD: intr.h,v 1.45 2014/07/20 15:46:34 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 2001, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -186,7 +186,7 @@ int x86_send_ipi(struct cpu_info *, int)
void x86_broadcast_ipi(int);
void x86_ipi_handler(void);
-extern void (*ipifunc[X86_NIPI])(struct cpu_info *);
+extern void (* const ipifunc[X86_NIPI])(struct cpu_info *);
#endif /* _KERNEL */
Index: src/sys/arch/x86/x86/ipi.c
diff -u src/sys/arch/x86/x86/ipi.c:1.24 src/sys/arch/x86/x86/ipi.c:1.25
--- src/sys/arch/x86/x86/ipi.c:1.24 Mon May 19 22:47:54 2014
+++ src/sys/arch/x86/x86/ipi.c Sun Jul 20 15:46:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ipi.c,v 1.24 2014/05/19 22:47:54 rmind Exp $ */
+/* $NetBSD: ipi.c,v 1.25 2014/07/20 15:46:34 uebayasi Exp $ */
/*-
* Copyright (c) 2000, 2008, 2009 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.24 2014/05/19 22:47:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.25 2014/07/20 15:46:34 uebayasi Exp $");
#include "opt_mtrr.h"
@@ -78,17 +78,17 @@ void acpi_cpu_sleep(struct cpu_info *);
static void x86_ipi_synch_fpu(struct cpu_info *);
-void (*ipifunc[X86_NIPI])(struct cpu_info *) =
+void (* const ipifunc[X86_NIPI])(struct cpu_info *) =
{
- x86_ipi_halt,
- NULL,
- x86_ipi_generic,
- x86_ipi_synch_fpu,
- x86_ipi_reload_mtrr,
- gdt_reload_cpu,
- x86_ipi_xcall,
- acpi_cpu_sleep,
- x86_ipi_kpreempt
+ x86_ipi_halt, /* X86_IPI_HALT */
+ NULL, /* X86_IPI_MICROSET */
+ x86_ipi_generic, /* X86_IPI_GENERIC */
+ x86_ipi_synch_fpu, /* X86_IPI_SYNCH_FPU */
+ x86_ipi_reload_mtrr, /* X86_IPI_MTRR */
+ gdt_reload_cpu, /* X86_IPI_GDT */
+ x86_ipi_xcall, /* X86_IPI_XCALL */
+ acpi_cpu_sleep, /* X86_IPI_ACPI_CPU_SLEEP */
+ x86_ipi_kpreempt /* X86_IPI_KPREEMPT */
};
/*