Merge branch 'master' into xkb

Conflicts:
	config.make.in
	configure.in

1 files changed, 13 insertions, 5 deletions

diff --git a/libpager/stubs.c b/libpager/stubs.c
index b455699e..84782120 100644
--- a/libpager/stubs.c
+++ b/libpager/stubs.c
@@ -1,5 +1,5 @@
  /* Unused memory object interface stubs
-   Copyright (C) 1994 Free Software Foundation
+   Copyright (C) 1994, 2011 Free Software Foundation
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -21,19 +21,22 @@
 #include <stdio.h>
 
 kern_return_t
-_pager_seqnos_memory_object_copy (mach_port_t old,
+_pager_seqnos_memory_object_copy (mach_port_t obj,
 			   mach_port_seqno_t seq,
-			   memory_object_control_t old_ctl,
+			   memory_object_control_t obj_ctl,
 			   vm_offset_t off,
 			   vm_size_t len,
 			   mach_port_t new)
 {
   printf ("m_o_copy called\n");
+
+  _pager_update_seqno (obj, seq);
+
   return EOPNOTSUPP;
 }
 
 kern_return_t
-_pager_seqnos_memory_object_data_write (mach_port_t old,
+_pager_seqnos_memory_object_data_write (mach_port_t obj,
 				 mach_port_seqno_t seq,
 				 mach_port_t ctl,
 				 vm_offset_t off,
@@ -41,6 +44,9 @@ _pager_seqnos_memory_object_data_write (mach_port_t old,
 				 vm_size_t data_cnt)
 {
   printf ("m_o_data_write called\n");
+
+  _pager_update_seqno (obj, seq);
+
   return EOPNOTSUPP;
 }
 
@@ -54,6 +60,8 @@ _pager_seqnos_memory_object_supply_completed (mach_port_t obj,
 				       vm_offset_t err_off)
 {
   printf ("m_o_supply_completed called\n");
+
+  _pager_update_seqno (obj, seq);
+
   return EOPNOTSUPP;
 }
-