Merge patch from Jeremy Fitzhardinge:

13-kill-1ifroot
  Kill VG_(get_current_tid_1_if_root)() and replace it with the slightly
  more appetising (though still hackish)
  VG_(get_current_or_recent_tid)(). This is intended for use when
  there's no thread actually loaded into the baseblock, but we're doing
  work on behalf of the the thread that was last running (such as during
  a syscall).

  This probably fixes a bug with helgrind misattributing memory created
  with mmap to thread 1 rather than the thread which called mmap (though
  the behaviour is still probably wrong: mmapped memory should be
  magically_inited).


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1262 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/include/vg_skin.h b/include/vg_skin.h
index b87f477..4a06bee 100644
--- a/include/vg_skin.h
+++ b/include/vg_skin.h
@@ -254,7 +254,7 @@
    ThreadState;
 
 extern ThreadId     VG_(get_current_tid)           ( void );
-extern ThreadId     VG_(get_current_tid_1_if_root) ( void );
+extern ThreadId     VG_(get_current_or_recent_tid) ( void );
 extern ThreadId     VG_(get_tid_from_ThreadState)  ( ThreadState* );
 extern ThreadState* VG_(get_ThreadState)           ( ThreadId tid );