On Sun, 9 Dec 2007, Paul Goyette wrote:

> --- kern-XEN3_DOMU ---
> /usr/src/sys/arch/xen/x86/cpu.c:857: error: conflicting types for 'cpu_init_msrs'
> /usr/obj/objdir/amd64/sys/arch/amd64/compile/XEN3_DOMU/xen-ma/machine/cpu.h:310: 
> error: previous declaration of 'cpu_init_msrs' was here

Responding to my own post, the following patch seems to work:

Index: cpu.c
===================================================================
RCS file: /cvsroot/src/sys/arch/xen/x86/cpu.c,v
retrieving revision 1.2
diff -u -p -r1.2 cpu.c
--- cpu.c	22 Nov 2007 16:17:03 -0000	1.2
+++ cpu.c	10 Dec 2007 05:34:43 -0000
@@ -853,7 +853,7 @@ mp_cpu_start_cleanup(struct cpu_info *ci
  #ifdef __x86_64__

  void
-cpu_init_msrs(struct cpu_info *ci)
+cpu_init_msrs(struct cpu_info *ci, bool b)
  {
  	HYPERVISOR_set_segment_base (SEGBASE_FS, 0);
  	HYPERVISOR_set_segment_base (SEGBASE_GS_KERNEL, (u_int64_t) ci);

----------------------------------------------------------------------
|   Paul Goyette   | PGP DSS Key fingerprint: |  E-mail addresses:   |
| Customer Service | FA29 0E3B 35AF E8AE 6651 |  paul@whooppee.com   |
| Network Engineer | 0786 F758 55DE 53BA 7731 | pgoyette@juniper.net |
----------------------------------------------------------------------