Index: resource.c
===================================================================
--- resource.c.orig	2009-04-14 14:51:00.000000000 +0200
+++ resource.c	2010-02-13 21:24:23.000000000 +0100
@@ -373,10 +373,10 @@ sys_sysinfo(struct tcb *tcp)
 				si.loads[2]);
 			tprintf("totalram=%lu, freeram=%lu, ",
 				si.totalram, si.freeram);
-			tprintf("sharedram=%lu, bufferram=%lu} ",
+			tprintf("sharedram=%lu, bufferram=%lu, ",
 				si.sharedram, si.bufferram);
-			tprintf("totalswap=%lu, freeswap=%lu, procs=%hu}",
-				si.totalswap, si.freeswap, si.procs);
+			tprintf("totalswap=%lu, freeswap=%lu, procs=%hu, mem_unit=%u}",
+				si.totalswap, si.freeswap, si.procs, si.mem_unit);
 		}
 	}
 	return 0;
Index: strace-graph
===================================================================
--- strace-graph.orig	2009-07-08 16:57:27.000000000 +0200
+++ strace-graph	2010-02-13 21:24:23.000000000 +0100
@@ -229,7 +229,7 @@ sub handle_trace {
 	push @$seq, ['EXEC', $filename, $argv];
 
 	$pr{$pid}{seq} = $seq;
-    } elsif ($call eq 'fork' || $call eq 'clone' || $call eq 'vfork') {
+    } elsif ($call eq 'fork' || $call eq 'clone' || $call eq 'clone2' || $call eq 'vfork') {
 	return if $result == 0;
 
 	my $seq = $pr{$pid}{seq};
Index: util.c
===================================================================
--- util.c.orig	2009-10-12 21:54:21.000000000 +0200
+++ util.c	2010-02-13 21:24:23.000000000 +0100
@@ -1407,9 +1407,8 @@ arg_setup(struct tcb *tcp, arg_setup_sta
 
 	sof = (cfm >> 0) & 0x7f;
 	sol = (cfm >> 7) & 0x7f;
-	bsp = (long) ia64_rse_skip_regs((unsigned long *) bsp, -sof + sol);
+	*state = ia64_rse_skip_regs((unsigned long *) bsp, -sof + sol);
 
-	*state = (unsigned long *) bsp;
 	return 0;
 }
 
Index: configure
===================================================================
--- configure.orig	2009-10-21 19:41:11.000000000 +0200
+++ configure	2010-02-13 21:25:46.000000000 +0100
@@ -5880,6 +5880,7 @@ for ac_header in linux/icmp.h linux/in6.
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#include <stddef.h>
+#include <sys/socket.h>
 #include <linux/socket.h>
 "
 eval as_val=\$$as_ac_Header
Index: configure.ac
===================================================================
--- configure.ac.orig	2009-10-12 21:54:43.000000000 +0200
+++ configure.ac	2010-02-13 21:25:22.000000000 +0100
@@ -258,6 +258,7 @@ AC_CHECK_HEADERS([ \
 ], [], [])
 AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
                  [], [], [#include <stddef.h>
+#include <sys/socket.h>
 #include <linux/socket.h>])
 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
 AC_CHECK_TYPES([struct sigcontext_struct,