--- 1	2008-01-15 20:28:30.000000000 +0900
+++ 2	2008-01-15 20:28:32.000000000 +0900
@@ -1,9 +1,12 @@
-20080112:
+20080113:
      $NetBSD: XENU,v 1.1 2005/03/11 20:48:24 bouyer Exp $
      $NetBSD: std.xen,v 1.4 2007/11/22 16:16:47 bouyer Exp $
      $NetBSD: std,v 1.9 2007/08/04 11:03:00 ad Exp $
      $NetBSD: GENERIC.local,v 1.3 2005/12/11 12:17:40 christos Exp $
+     $NetBSD: locore.S,v 1.62 2008/01/11 20:00:14 bouyer Exp $
+     $NetBSD: spl.S,v 1.26 2008/01/11 20:00:14 bouyer Exp $
      $NetBSD: copy.S,v 1.13 2007/12/11 23:06:11 lukem Exp $
+     $NetBSD: vector.S,v 1.34 2008/01/11 20:00:14 bouyer Exp $
      $NetBSD: param.c,v 1.53 2007/12/26 16:01:35 ad Exp $
      $NetBSD: des_ecb.c,v 1.9 2005/12/11 12:20:52 christos Exp $
      $NetBSD: des_setkey.c,v 1.10 2005/12/11 12:20:52 christos Exp $
@@ -22,7 +25,7 @@
      $NetBSD: ip_icmp.c,v 1.114 2007/11/09 23:42:56 dyoung Exp $
      $NetBSD: ip_id.c,v 1.11 2006/08/30 18:54:19 christos Exp $
      $NetBSD: ip_input.c,v 1.260 2007/12/22 15:41:11 matt Exp $
-     $NetBSD: ip_output.c,v 1.189 2007/12/29 15:13:55 degroote Exp $
+     $NetBSD: ip_output.c,v 1.190 2008/01/12 02:58:58 dyoung Exp $
      $NetBSD: raw_ip.c,v 1.102 2007/12/21 02:07:55 matt Exp $
      $NetBSD: tcp_input.c,v 1.275 2007/12/20 20:24:49 martin Exp $
      $NetBSD: tcp_output.c,v 1.163 2007/12/20 19:53:32 dyoung Exp $
@@ -38,11 +41,11 @@
      $NetBSD: in6.c,v 1.139 2007/12/06 00:28:36 dyoung Exp $
      $NetBSD: in6_ifattach.c,v 1.79 2007/12/06 00:28:36 dyoung Exp $
      $NetBSD: in6_offload.c,v 1.4 2007/05/02 20:40:26 dyoung Exp $
-     $NetBSD: in6_pcb.c,v 1.92 2008/01/10 08:06:11 dyoung Exp $
+     $NetBSD: in6_pcb.c,v 1.93 2008/01/12 02:58:58 dyoung Exp $
      $NetBSD: in6_proto.c,v 1.79 2007/09/19 04:33:44 dyoung Exp $
      $NetBSD: in6_src.c,v 1.40 2007/11/26 08:12:33 yamt Exp $
      $NetBSD: ip6_flow.c,v 1.13 2008/01/04 23:35:00 dyoung Exp $
-     $NetBSD: ip6_forward.c,v 1.60 2008/01/10 08:06:12 dyoung Exp $
+     $NetBSD: ip6_forward.c,v 1.61 2008/01/12 02:58:58 dyoung Exp $
      $NetBSD: ip6_id.c,v 1.16 2006/08/30 17:11:53 christos Exp $
      $NetBSD: ip6_input.c,v 1.113 2007/12/04 10:27:34 dyoung Exp $
      $NetBSD: ip6_mroute.c,v 1.86 2007/11/27 22:45:30 christos Exp $
@@ -210,7 +213,7 @@
      $NetBSD: ffs_bswap.c,v 1.32 2005/12/11 12:25:25 christos Exp $
      $NetBSD: ffs_inode.c,v 1.94 2008/01/09 16:15:23 ad Exp $
      $NetBSD: ffs_snapshot.c,v 1.58 2008/01/03 01:26:32 pooka Exp $
-     $NetBSD: ffs_softdep.c,v 1.105 2008/01/07 16:56:27 ad Exp $
+     $NetBSD: ffs_softdep.c,v 1.106 2008/01/12 00:34:10 ad Exp $
      $NetBSD: ffs_subr.c,v 1.44 2007/01/29 01:52:46 hubertf Exp $
      $NetBSD: ffs_tables.c,v 1.9 2005/12/11 12:25:25 christos Exp $
      $NetBSD: ffs_vfsops.c,v 1.218 2008/01/09 18:20:54 ad Exp $
@@ -435,7 +438,7 @@
      $NetBSD: radix.c,v 1.38 2007/07/12 04:28:59 dyoung Exp $
      $NetBSD: raw_cb.c,v 1.18 2007/03/04 06:03:18 christos Exp $
      $NetBSD: raw_usrreq.c,v 1.33 2007/05/06 06:21:26 dyoung Exp $
-     $NetBSD: route.c,v 1.102 2008/01/10 08:03:22 dyoung Exp $
+     $NetBSD: route.c,v 1.103 2008/01/12 02:56:30 dyoung Exp $
      $NetBSD: rtsock.c,v 1.97 2007/12/20 19:53:31 dyoung Exp $
      $NetBSD: zlib.c,v 1.28 2006/11/16 01:33:40 christos Exp $
      $NetBSD: if_arp.c,v 1.130 2007/12/07 19:46:18 elad Exp $
@@ -463,56 +466,55 @@
      $NetBSD: db_dbgreg.S,v 1.7 2007/12/11 23:31:07 lukem Exp $
      $NetBSD: db_disasm.c,v 1.37 2007/12/30 13:28:20 yamt Exp $
      $NetBSD: db_interface.c,v 1.57 2008/01/04 21:24:22 xtraeme Exp $
-     $NetBSD: db_memrw.c,v 1.22 2007/10/18 15:28:35 yamt Exp $
+     $NetBSD: db_memrw.c,v 1.23 2008/01/11 20:00:13 bouyer Exp $
      $NetBSD: db_trace.c,v 1.58 2007/10/17 19:54:45 garbled Exp $
-     $NetBSD: gdt.c,v 1.11 2008/01/04 15:55:34 yamt Exp $
+     $NetBSD: gdt.c,v 1.44 2008/01/11 20:00:13 bouyer Exp $
      $NetBSD: in_cksum.S,v 1.5 2007/12/11 23:06:13 lukem Exp $
-     $NetBSD: machdep.c,v 1.52 2008/01/04 16:38:46 yamt Exp $
+     $NetBSD: machdep.c,v 1.622 2008/01/11 20:00:14 bouyer Exp $
      $NetBSD: identcpu.c,v 1.86 2008/01/01 20:32:10 yamt Exp $
      $NetBSD: x86_identcpu.c,v 1.2 2008/01/04 15:44:58 yamt Exp $
      $NetBSD: mem.c,v 1.69 2007/03/04 05:59:57 christos Exp $
-     $NetBSD: pmap.c,v 1.40 2008/01/04 15:55:35 yamt Exp $
+     $NetBSD: pmap.c,v 1.25 2008/01/12 09:10:24 yamt Exp $
      $NetBSD: process_machdep.c,v 1.65 2007/10/17 19:54:46 garbled Exp $
      $NetBSD: procfs_machdep.c,v 1.27 2007/10/17 19:54:46 garbled Exp $
      $NetBSD: syscall.c,v 1.49 2008/01/05 12:53:53 dsl Exp $
      $NetBSD: trap.c,v 1.231 2008/01/02 11:48:25 ad Exp $
      $NetBSD: vm_machdep.c,v 1.137 2008/01/04 16:38:46 yamt Exp $
-     $NetBSD: xpmap.c,v 1.2 2007/11/22 16:16:55 bouyer Exp $
      $NetBSD: lock_stubs.S,v 1.12 2007/12/20 23:46:10 ad Exp $
      $NetBSD: des_enc.S,v 1.5 2007/12/11 23:31:08 lukem Exp $
      $NetBSD: des_cbc.S,v 1.6 2007/12/11 23:31:07 lukem Exp $
      $NetBSD: subr_disk_mbr.c,v 1.31 2008/01/02 11:48:53 ad Exp $
      $NetBSD: hypervisor_machdep.c,v 1.4 2007/12/20 23:46:11 ad Exp $
      $NetBSD: idle_machdep.c,v 1.3 2007/12/02 16:37:58 ad Exp $
-     $NetBSD: x86_xpmap.c,v 1.3 2007/11/23 09:54:33 bouyer Exp $
+     $NetBSD: x86_xpmap.c,v 1.4 2008/01/11 20:00:52 bouyer Exp $
      $NetBSD: xen_intr.c,v 1.2 2007/11/22 16:17:05 bouyer Exp $
      $NetBSD: xen_machdep.c,v 1.2 2007/11/22 16:17:09 bouyer Exp $
      $NetBSD: xen_debug.c,v 1.5 2007/11/22 16:17:09 bouyer Exp $
      $NetBSD: clock.c,v 1.43 2008/01/08 20:37:35 joerg Exp $
-     $NetBSD: evtchn.c,v 1.29 2008/01/05 19:29:26 bouyer Exp $
+     $NetBSD: evtchn.c,v 1.30 2008/01/11 20:00:53 bouyer Exp $
      $NetBSD: cons.c,v 1.64 2007/07/09 21:00:28 ad Exp $
      $NetBSD: cacheinfo.c,v 1.14 2008/01/04 21:17:44 ad Exp $
      $NetBSD: consinit.c,v 1.10 2007/11/22 16:17:03 bouyer Exp $
-     $NetBSD: intr.c,v 1.16 2007/12/20 23:46:12 ad Exp $
+     $NetBSD: intr.c,v 1.17 2008/01/11 20:00:51 bouyer Exp $
      $NetBSD: sys_machdep.c,v 1.10 2008/01/05 21:47:18 yamt Exp $
      $NetBSD: x86_machdep.c,v 1.15 2007/12/06 13:58:38 ad Exp $
-     $NetBSD: bios32.c,v 1.5 2007/10/17 19:58:18 garbled Exp $
-     $NetBSD: mainbus.c,v 1.2 2007/11/22 16:17:04 bouyer Exp $
-     $NetBSD: hypervisor.c,v 1.32 2007/11/22 16:17:07 bouyer Exp $
+     $NetBSD: bios32.c,v 1.18 2008/01/11 20:00:13 bouyer Exp $
+     $NetBSD: mainbus.c,v 1.3 2008/01/11 20:00:52 bouyer Exp $
+     $NetBSD: hypervisor.c,v 1.33 2008/01/11 20:00:54 bouyer Exp $
      $NetBSD: shutdown_xenbus.c,v 1.4 2007/11/22 16:17:08 bouyer Exp $
      $NetBSD: xenbus_client.c,v 1.8 2007/12/15 00:39:24 perry Exp $
      $NetBSD: xenbus_comms.c,v 1.5 2007/11/22 16:17:11 bouyer Exp $
      $NetBSD: xenbus_probe.c,v 1.18 2007/12/15 00:39:24 perry Exp $
-     $NetBSD: xenbus_xs.c,v 1.12 2007/12/15 00:39:24 perry Exp $
-     $NetBSD: npx.c,v 1.11 2007/12/26 11:51:13 yamt Exp $
-     $NetBSD: npx_hv.c,v 1.3 2005/12/11 12:19:48 christos Exp $
+     $NetBSD: xenbus_xs.c,v 1.13 2008/01/11 20:00:54 bouyer Exp $
+     $NetBSD: npx.c,v 1.122 2008/01/11 20:00:17 bouyer Exp $
+     $NetBSD: npx_hv.c,v 1.4 2008/01/11 20:00:23 bouyer Exp $
      $NetBSD: xencons.c,v 1.25 2007/11/22 16:17:09 bouyer Exp $
      $NetBSD: if_xennet_xenbus.c,v 1.22 2007/12/03 15:34:30 ad Exp $
      $NetBSD: xbd_xenbus.c,v 1.23 2007/11/22 16:17:08 bouyer Exp $
      $NetBSD: pcibusprint.c,v 1.3 2005/12/11 12:22:50 christos Exp $
      $NetBSD: isabusprint.c,v 1.5 2006/11/16 01:33:00 christos Exp $
      $NetBSD: i8259.c,v 1.12 2007/10/17 19:58:16 garbled Exp $
-     $NetBSD: cpu.c,v 1.6 2008/01/04 15:55:35 yamt Exp $
+     $NetBSD: cpu.c,v 1.7 2008/01/11 20:00:50 bouyer Exp $
      $NetBSD: linux_blkio.c,v 1.16 2007/12/20 23:02:53 dsl Exp $
      $NetBSD: linux_cdrom.c,v 1.25 2007/12/20 23:02:53 dsl Exp $
      $NetBSD: linux_errno.c,v 1.12 2001/11/13 02:08:49 lukem Exp $