From: Andy P. <at...@us...> - 2002-04-09 12:34:23
|
Update of /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sn In directory usw-pr-cvs1:/tmp/cvs-serv9454/asm-mips64/sn Modified Files: arch.h gda.h klconfig.h launch.h nmi.h types.h Log Message: Synch to 2.4.15 commit 1 Index: arch.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sn/arch.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- arch.h 14 Jan 2001 17:05:09 -0000 1.1.1.1 +++ arch.h 9 Apr 2002 12:33:16 -0000 1.2 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. Index: gda.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sn/gda.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- gda.h 14 Jan 2001 17:05:09 -0000 1.1.1.1 +++ gda.h 9 Apr 2002 12:33:16 -0000 1.2 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. Index: klconfig.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sn/klconfig.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- klconfig.h 14 Jan 2001 17:05:14 -0000 1.1.1.1 +++ klconfig.h 9 Apr 2002 12:33:16 -0000 1.2 @@ -936,6 +936,7 @@ extern klinfo_t *find_component(lboard_t *brd, klinfo_t *kli, unsigned char type); extern klinfo_t *find_first_component(lboard_t *brd, unsigned char type); extern klcpu_t *nasid_slice_to_cpuinfo(nasid_t, int); +extern lboard_t *find_lboard_class(lboard_t *start, unsigned char brd_class); #if defined(CONFIG_SGI_IO) @@ -943,7 +944,6 @@ extern vertex_hdl_t nodevertex_xbow_peer_get(vertex_hdl_t node_vtx); extern lboard_t *find_gfxpipe(int pipenum); extern void setup_gfxpipe_link(vertex_hdl_t vhdl,int pipenum); -extern lboard_t *find_lboard_class(lboard_t *start, unsigned char brd_class); extern lboard_t *find_lboard_module_class(lboard_t *start, moduleid_t mod, unsigned char brd_class); extern lboard_t *find_nic_lboard(lboard_t *, nic_t); Index: launch.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sn/launch.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- launch.h 14 Jan 2001 17:05:17 -0000 1.1.1.1 +++ launch.h 9 Apr 2002 12:33:16 -0000 1.2 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. Index: nmi.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sn/nmi.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 Index: types.h =================================================================== RCS file: /cvsroot/linux-vax/kernel-2.4/include/asm-mips64/sn/types.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- types.h 14 Jan 2001 17:05:16 -0000 1.1.1.1 +++ types.h 9 Apr 2002 12:33:16 -0000 1.2 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * This file is subject to the terms and conditions of the GNU General Public * License. See the file "COPYING" in the main directory of this archive * for more details. @@ -13,7 +12,6 @@ #include <linux/types.h> typedef unsigned long cpuid_t; -typedef unsigned long cpumask_t; typedef unsigned long cnodemask_t; typedef signed short nasid_t; /* node id in numa-as-id space */ typedef signed short cnodeid_t; /* node id in compact-id space */ |