Re: [CI] Changes needed to build the CVS version of CI.

[Brian J. W. <Bri...@co...>]

Laura and Dave-

These changes appear to affect your code. Are you both okay with them?

-Brian


"Aneesh Kumar K.V" wrote:
> 
> Hi,
> 
>  Attaching below is the changes needed to build the CVS version of CI.
> Mostly #ifdef changes. I am not sure i am using the right #ifdef . Can
> someone verify it and do the necessary checkin. ?
> 
>  -aneesh
> 
> --- Cluster/ci-linux/ci-kernel/cluster/util/nsc_init.c  Thu Aug  8 05:30:57 2002
> +++ TEST/ci-linux/ci-kernel/cluster/util/nsc_init.c     Mon Oct 21 22:51:34 2002
> @@ -37,8 +37,8 @@
>  #include <cluster/clms.h>
>  #include <cluster/icsgen.h>
>  #include <cluster/ics_proto.h>
> -#include <cluster/procfs.h>
>  #ifdef CONFIG_SSI
> +#include <cluster/procfs.h>
>  #include <cluster/ssi/ssidev.h>
>  #endif /* CONFIG_SSI */
>  #ifdef CONFIG_MOSIX_LL
> @@ -287,8 +287,10 @@
>  #endif
>  #endif /* NOTYET */
> 
> +#ifdef CONFIG_SSI  /* Or should it be CONFIG_LDLVL ??*/
>         /* Create /proc/cluster/node# directory in /proc */
>         proc_cluster_init();
> +#endif
> 
>  #ifdef CONFIG_MOSIX_LL
>         init_mosix();
> 
> --- Cluster/ci-linux/ci-kernel/cluster/util/nsc_scalls.c        Sun Oct  6 12:27:06 2002
> +++ TEST/ci-linux/ci-kernel/cluster/util/nsc_scalls.c   Mon Oct 21 22:37:45 2002
> @@ -44,7 +44,9 @@
>  #include <cluster/synch.h>
>  #include <cluster/ssisys.h>
>  #include <cluster/table.h>
> +#ifdef CONFIG_CFS
>  #include <cluster/ssi/cfs/cfs_mount.h>
> +#endif
> 
>  #include "ics_cluster_api_protos_gen.h"
>  #include "ics_cluster_api_macros_gen.h"
> 
> --- Cluster/ci-linux/ci-kernel/cluster/util/cluster_api.svc     Sat Jul 13 06:52:03 2002
> +++ TEST/ci-linux/ci-kernel/cluster/util/cluster_api.svc        Mon Oct 21 22:36:55 2002
> @@ -36,6 +36,8 @@
>         param OUT int                   *onlinecpus
>  }
> 
> +#ifdef CONFIG_CFS  /* Do we pass this flag when doing icsgen ? */
> +
>  operation rcluster_get_mount NO_SIG_FORWARD {
>         param IN int                    my_node
>         param INOUT int                 *cookie
> @@ -45,3 +47,4 @@
>         param OUT:OOL:VAR char          **payload
>         param OUT:OOL:VAR char          **dev_name
>  }
> +#endif