[oprof-cvs] CVS: oprofile/daemon opd_perfmon.c,1.15,1.16

[John L. <mov...@us...>]

Update of /cvsroot/oprofile/oprofile/daemon
In directory sc8-pr-cvs1:/tmp/cvs-serv1141/daemon

Modified Files:
	opd_perfmon.c 
Log Message:
fix compilation on IA-64


Index: opd_perfmon.c
===================================================================
RCS file: /cvsroot/oprofile/oprofile/daemon/opd_perfmon.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -d -r1.15 -r1.16
--- opd_perfmon.c	27 Oct 2003 02:27:25 -0000	1.15
+++ opd_perfmon.c	31 Oct 2003 15:24:53 -0000	1.16
@@ -28,16 +28,19 @@
 #include <string.h>
 #include <errno.h>
 
-extern op_cpu op_cpu_type;
+extern op_cpu cpu_type;
+
+/* FIXME: should autoconf these */
 
 /* many glibc's are not yet up to date */
 #ifndef __NR_sched_setaffinity
 #define __NR_sched_setaffinity 1231
+#endif
+
 static int sched_setaffinity(pid_t pid, unsigned int len, unsigned long * mask)
 {
 	return syscall(__NR_sched_setaffinity, pid, len, mask);
 }
-#endif
 
 
 #ifndef __NR_perfmonctl
@@ -256,7 +259,7 @@ static void load_context(struct child * 
 	pfarg_load_t load_args;
 	int err;
 
-	memset(load_args, 0, sizeof(load_args));
+	memset(&load_args, 0, sizeof(load_args));
 	load_args.load_pid = self->pid;
 
 	err = perfmonctl(self->ctx_fd, PFM_LOAD_CONTEXT, &load_args, 1);