From ac493dbc901ee39cbcdfda9432d2b8f64005f1b3 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Mon, 19 Jun 2006 15:04:08 +0000
Subject: [PATCH] update for v2.6.17

git-svn-id: http://ltt.polymtl.ca/svn@1934 04897980-b3bd-0310-b5e0-8ef037075253
---
 genevent/genevent.c                           |  4 +-
 ltt-control/facilities/kernel_arch_c2.xml     | 52 +++++++++++++-
 ltt-control/facilities/kernel_arch_i386.xml   | 27 +++++++-
 ltt-control/facilities/kernel_arch_mips.xml   | 69 +++++++++++++++++++
 .../facilities/kernel_arch_powerpc.xml        | 22 +++++-
 ltt-control/facilities/kernel_arch_ppc.xml    | 22 +++++-
 ltt-usertrace/ltt/ltt-usertrace.h             | 18 ++---
 7 files changed, 194 insertions(+), 20 deletions(-)

diff --git a/genevent/genevent.c b/genevent/genevent.c
index c788d85a..faf362e5 100644
--- a/genevent/genevent.c
+++ b/genevent/genevent.c
@@ -1508,7 +1508,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
 	print_tabs(1, fd);
 	fprintf(fd, "preempt_disable();\n");
 	print_tabs(1, fd);
-	fprintf(fd, "ltt_nesting[smp_processor_id()]++;\n");
+	fprintf(fd, "current->ltt_nesting++;\n");
 
 	/* Get facility index */
 
@@ -1632,7 +1632,7 @@ int print_event_logging_function(char *basename, facility_t *fac,
 
 	/* Release locks */
 	print_tabs(1, fd);
-	fprintf(fd, "ltt_nesting[smp_processor_id()]--;\n");
+	fprintf(fd, "current->ltt_nesting--;\n");
 	print_tabs(1, fd);
 	fprintf(fd, "preempt_enable_no_resched();\n");
 
diff --git a/ltt-control/facilities/kernel_arch_c2.xml b/ltt-control/facilities/kernel_arch_c2.xml
index 11197a17..7aef352b 100644
--- a/ltt-control/facilities/kernel_arch_c2.xml
+++ b/ltt-control/facilities/kernel_arch_c2.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <facility name="kernel_arch" arch="c2">
   <description>The kernel facility has events related to kernel execution status
-	for the C2 architecture.</description>
+	for the MIPS architecture.</description>
   <type name=syscall_name>
     <enum>
 			<label name="o32_base" value="3999"><description>Linux o32 style syscalls</description>
@@ -292,7 +292,29 @@
 			<label name="o32_inotify_init" value="4284">
 			<label name="o32_inotify_add_watch" value="4285">
 			<label name="o32_inotify_rm_watch" value="4286">
-	
+			<label name="o32_migrate_pages" value="4287">
+			<label name="o32_openat" value="4288">
+			<label name="o32_mkdirat" value="4289">
+			<label name="o32_mknodat" value="4290">
+			<label name="o32_fchownat" value="4291">
+			<label name="o32_futimesat" value="4292">
+			<label name="o32_fstatat64" value="4293">
+			<label name="o32_unlinkat" value="4294">
+			<label name="o32_renameat" value="4295">
+			<label name="o32_linkat" value="4296">
+			<label name="o32_symlinkat" value="4297">
+			<label name="o32_readlinkat" value="4298">
+			<label name="o32_fchmodat" value="4299">
+			<label name="o32_faccessat" value="4300">
+			<label name="o32_pselect6" value="4301">
+			<label name="o32_ppoll" value="4302">
+			<label name="o32_unshare" value="4303">
+			<label name="o32_set_robust_list" value="4304">
+			<label name="o32_get_robust_list" value="4305">
+			<label name="o32_splice" value="4306">
+			<label name="o32_sync_file_range" value="4307">
+			<label name="o32_tee" value="4308">
+			<label name="o32_vmsplice" value="4309">
 
 			<label name="N32_base" value="5999">
 			<label name="N32_read" value="6000">
@@ -545,12 +567,36 @@
 			<label name="N32_inotify_init" value="6247">
 			<label name="N32_inotify_add_watch" value="6248">
 			<label name="N32_inotify_rm_watch" value="6249">
+			<label name="N32_migrate_pages" value="6250">
+			<label name="N32_openat" value="6251">
+			<label name="N32_mkdirat" value="6252">
+			<label name="N32_mknodat" value="6253">
+			<label name="N32_fchownat" value="6254">
+			<label name="N32_futimesat" value="6255">
+			<label name="N32_fstatat64" value="6256">
+			<label name="N32_unlinkat" value="6257">
+			<label name="N32_renameat" value="6258">
+			<label name="N32_linkat" value="6259">
+			<label name="N32_symlinkat" value="6260">
+			<label name="N32_readlinkat" value="6261">
+			<label name="N32_fchmodat" value="6262">
+			<label name="N32_faccessat" value="6263">
+			<label name="N32_pselect6" value="6264">
+			<label name="N32_ppoll" value="6265">
+			<label name="N32_unshare" value="6266">
+			<label name="N32_set_robust_list" value="6267">
+			<label name="N32_get_robust_list" value="6268">
+			<label name="N32_splice" value="6269">
+			<label name="N32_sync_file_range" value="6270">
+			<label name="N32_tee" value="6271">
+			<label name="N32_vmsplice" value="6272">
     </enum>
   </type>
 
   <event name="syscall_entry">
     <description>System call entry</description>
-    <field name="syscall_id"> <description>Syscall entry number in entry.S</description> <typeref name="syscall_name"> </field>
+    <field name="syscall_id"> <description>Syscall entry number in
+		entry.S</description> <typeref name="syscall_name"> </field>
     <field name="address"> <description>Address from which call was made</description> <pointer> </field>
   </event>
 	
diff --git a/ltt-control/facilities/kernel_arch_i386.xml b/ltt-control/facilities/kernel_arch_i386.xml
index ecab0764..d022843a 100644
--- a/ltt-control/facilities/kernel_arch_i386.xml
+++ b/ltt-control/facilities/kernel_arch_i386.xml
@@ -295,8 +295,31 @@
 			<label name="inotify_init" value="291">
 			<label name="inotify_add_watch" value="292">
 			<label name="inotify_rm_watch" value="293">
-			<label name="ltt_trace_generic" value="294">
-			<label name="ltt_register_generic" value="295">
+			<label name="migrate_pages" value="294">
+			<label name="openat" value="295">
+			<label name="mkdirat" value="296">
+			<label name="mknodat" value="297">
+			<label name="fchownat" value="298">
+			<label name="futimesat" value="299">
+			<label name="fstatat64" value="300">
+			<label name="unlinkat" value="301">
+			<label name="renameat" value="302">
+			<label name="linkat" value="303">
+			<label name="symlinkat" value="304">
+			<label name="readlinkat" value="305">
+			<label name="fchmodat" value="306">
+			<label name="faccessat" value="307">
+			<label name="pselect6" value="308">
+			<label name="ppoll" value="309">
+			<label name="unshare" value="310">
+			<label name="set_robust_list" value="311">
+			<label name="get_robust_list" value="312">
+			<label name="splice" value="313">
+			<label name="sync_file_range" value="314">
+			<label name="tee" value="315">
+			<label name="vmsplice" value="316">
+			<label name="ltt_trace_generic" value="317">
+			<label name="ltt_register_generic" value="318">
     </enum>
   </type>
 
diff --git a/ltt-control/facilities/kernel_arch_mips.xml b/ltt-control/facilities/kernel_arch_mips.xml
index d2dc54a2..461e4a63 100644
--- a/ltt-control/facilities/kernel_arch_mips.xml
+++ b/ltt-control/facilities/kernel_arch_mips.xml
@@ -292,6 +292,29 @@
 			<label name="o32_inotify_init" value="4284">
 			<label name="o32_inotify_add_watch" value="4285">
 			<label name="o32_inotify_rm_watch" value="4286">
+			<label name="o32_migrate_pages" value="4287">
+			<label name="o32_openat" value="4288">
+			<label name="o32_mkdirat" value="4289">
+			<label name="o32_mknodat" value="4290">
+			<label name="o32_fchownat" value="4291">
+			<label name="o32_futimesat" value="4292">
+			<label name="o32_fstatat64" value="4293">
+			<label name="o32_unlinkat" value="4294">
+			<label name="o32_renameat" value="4295">
+			<label name="o32_linkat" value="4296">
+			<label name="o32_symlinkat" value="4297">
+			<label name="o32_readlinkat" value="4298">
+			<label name="o32_fchmodat" value="4299">
+			<label name="o32_faccessat" value="4300">
+			<label name="o32_pselect6" value="4301">
+			<label name="o32_ppoll" value="4302">
+			<label name="o32_unshare" value="4303">
+			<label name="o32_set_robust_list" value="4304">
+			<label name="o32_get_robust_list" value="4305">
+			<label name="o32_splice" value="4306">
+			<label name="o32_sync_file_range" value="4307">
+			<label name="o32_tee" value="4308">
+			<label name="o32_vmsplice" value="4309">
 
 			<label name="l64_base" value="4999">
 			<label name="l64_read" value="5000">
@@ -540,6 +563,29 @@
 			<label name="l64_inotify_init" value="5243">
 			<label name="l64_inotify_add_watch" value="5244">
 			<label name="l64_inotify_rm_watch" value="5245">
+			<label name="l64_migrate_pages" value="5246">
+			<label name="l64_openat" value="5247">
+			<label name="l64_mkdirat" value="5248">
+			<label name="l64_mknodat" value="5249">
+			<label name="l64_fchownat" value="5250">
+			<label name="l64_futimesat" value="5251">
+			<label name="l64_fstatat64" value="5252">
+			<label name="l64_unlinkat" value="5253">
+			<label name="l64_renameat" value="5254">
+			<label name="l64_linkat" value="5255">
+			<label name="l64_symlinkat" value="5256">
+			<label name="l64_readlinkat" value="5257">
+			<label name="l64_fchmodat" value="5258">
+			<label name="l64_faccessat" value="5259">
+			<label name="l64_pselect6" value="5260">
+			<label name="l64_ppoll" value="5261">
+			<label name="l64_unshare" value="5262">
+			<label name="l64_set_robust_list" value="5263">
+			<label name="l64_get_robust_list" value="5264">
+			<label name="l64_splice" value="5265">
+			<label name="l64_sync_file_range" value="5266">
+			<label name="l64_tee" value="5267">
+			<label name="l64_vmsplice" value="5268">
 
 			<label name="N32_base" value="5999">
 			<label name="N32_read" value="6000">
@@ -792,6 +838,29 @@
 			<label name="N32_inotify_init" value="6247">
 			<label name="N32_inotify_add_watch" value="6248">
 			<label name="N32_inotify_rm_watch" value="6249">
+			<label name="N32_migrate_pages" value="6250">
+			<label name="N32_openat" value="6251">
+			<label name="N32_mkdirat" value="6252">
+			<label name="N32_mknodat" value="6253">
+			<label name="N32_fchownat" value="6254">
+			<label name="N32_futimesat" value="6255">
+			<label name="N32_fstatat64" value="6256">
+			<label name="N32_unlinkat" value="6257">
+			<label name="N32_renameat" value="6258">
+			<label name="N32_linkat" value="6259">
+			<label name="N32_symlinkat" value="6260">
+			<label name="N32_readlinkat" value="6261">
+			<label name="N32_fchmodat" value="6262">
+			<label name="N32_faccessat" value="6263">
+			<label name="N32_pselect6" value="6264">
+			<label name="N32_ppoll" value="6265">
+			<label name="N32_unshare" value="6266">
+			<label name="N32_set_robust_list" value="6267">
+			<label name="N32_get_robust_list" value="6268">
+			<label name="N32_splice" value="6269">
+			<label name="N32_sync_file_range" value="6270">
+			<label name="N32_tee" value="6271">
+			<label name="N32_vmsplice" value="6272">
     </enum>
   </type>
 
diff --git a/ltt-control/facilities/kernel_arch_powerpc.xml b/ltt-control/facilities/kernel_arch_powerpc.xml
index e6d9b7bd..e9fa0579 100644
--- a/ltt-control/facilities/kernel_arch_powerpc.xml
+++ b/ltt-control/facilities/kernel_arch_powerpc.xml
@@ -286,8 +286,26 @@
 			<label name="pselect6" value="280">
 			<label name="ppoll" value="281">
 			<label name="unshare" value="282">
-			<label name="ltt_trace_generic" value="283">
-			<label name="ltt_register_generic" value="284">
+			<label name="splice" value="283">
+			<label name="tee" value="284">
+			<label name="vmsplice" value="285">
+			<label name="openat" value="286">
+			<label name="mkdirat" value="287">
+			<label name="mknodat" value="288">
+			<label name="fchownat" value="289">
+			<label name="futimesat" value="290">
+			<label name="fstatat64" value="291">
+			<label name="unlinkat" value="292">
+			<label name="renameat" value="293">
+			<label name="linkat" value="294">
+			<label name="symlinkat" value="295">
+			<label name="readlinkat" value="296">
+			<label name="fchmodat" value="297">
+			<label name="faccessat" value="298">
+			<label name="get_robust_list" value="299">
+			<label name="set_robust_list" value="300">
+			<label name="ltt_trace_generic" value="301">
+			<label name="ltt_register_generic" value="302">
     </enum>
   </type>
 
diff --git a/ltt-control/facilities/kernel_arch_ppc.xml b/ltt-control/facilities/kernel_arch_ppc.xml
index 8fb6ebab..909eaef1 100644
--- a/ltt-control/facilities/kernel_arch_ppc.xml
+++ b/ltt-control/facilities/kernel_arch_ppc.xml
@@ -286,8 +286,26 @@
 			<label name="pselect6" value="280">
 			<label name="ppoll" value="281">
 			<label name="unshare" value="282">
-			<label name="ltt_trace_generic" value="283">
-			<label name="ltt_register_generic" value="284">
+			<label name="splice" value="283">
+			<label name="tee" value="284">
+			<label name="vmsplice" value="285">
+			<label name="openat" value="286">
+			<label name="mkdirat" value="287">
+			<label name="mknodat" value="288">
+			<label name="fchownat" value="289">
+			<label name="futimesat" value="290">
+			<label name="fstatat64" value="291">
+			<label name="unlinkat" value="292">
+			<label name="renameat" value="293">
+			<label name="linkat" value="294">
+			<label name="symlinkat" value="295">
+			<label name="readlinkat" value="296">
+			<label name="fchmodat" value="297">
+			<label name="faccessat" value="298">
+			<label name="get_robust_list" value="299">
+			<label name="set_robust_list" value="300">
+			<label name="ltt_trace_generic" value="301">
+			<label name="ltt_register_generic" value="302">
     </enum>
   </type>
 
diff --git a/ltt-usertrace/ltt/ltt-usertrace.h b/ltt-usertrace/ltt/ltt-usertrace.h
index be3a73d6..373315ab 100644
--- a/ltt-usertrace/ltt/ltt-usertrace.h
+++ b/ltt-usertrace/ltt/ltt-usertrace.h
@@ -39,24 +39,24 @@
 #endif
 
 #ifdef i386
-#define __NR_ltt_trace_generic	311
-#define __NR_ltt_register_generic	312
+#define __NR_ltt_trace_generic	317
+#define __NR_ltt_register_generic	318
 #undef NR_syscalls
-#define NR_syscalls 313
+#define NR_syscalls 319
 #endif
 
 #ifdef __powerpc__
-#define __NR_ltt_trace_generic	283
-#define __NR_ltt_register_generic	284
+#define __NR_ltt_trace_generic	301
+#define __NR_ltt_register_generic	302
 #undef NR_syscalls
-#define NR_syscalls 285
+#define NR_syscalls 303
 #endif
 
 #ifdef __powerpc64__
-#define __NR_ltt_trace_generic	283
-#define __NR_ltt_register_generic	284
+#define __NR_ltt_trace_generic	301
+#define __NR_ltt_register_generic	302
 #undef NR_syscalls
-#define NR_syscalls 285
+#define NR_syscalls 303
 #endif
 
 
-- 
2.34.1