Re: 2.6.7-rc2-mm1

Mikael Pettersson
2004-06-01T16:29:27Z

William Lee Irwin III writes:
> On Tue, Jun 01, 2004 at 02:15:39AM -0700, Andrew Morton wrote:
> > - NFS server udpates
> > - md updates
> > - big x86 dmi_scan.c cleanup
> > - merged perfctr. No documentation though :(
> > - cris architecture update
>
> Hmm. perfctr needs some structs.

Indeed. CONFIG_PERFCTR=n leads to compile-time warnings
from the syscall prototypes in <linux/perfctr.h>.
I'm not sure if providing dummy struct declarations is
cleaner than bracketing the offending code inside #ifdef
CONFIG_PERFCTR, but this patch should fix the warnings for now.

Andrew: please apply.

/Mikael

--- linux-2.6.7-rc2-mm1/include/linux/perfctr.h.~1~ 2004-06-01 17:53:56.000000000 +0200
+++ linux-2.6.7-rc2-mm1/include/linux/perfctr.h 2004-06-01 18:18:24.000000000 +0200
@@ -54,6 +54,11 @@
unsigned int _reserved4;
};

+#else
+struct perfctr_info;
+struct perfctr_cpu_mask;
+struct perfctr_sum_ctrs;
+struct vperfctr_control;
#endif /* CONFIG_PERFCTR */

#ifdef __KERNEL__