Revert 38766 - Temporarily land http://codereview.chromium.org/576001 to check the

performance.

TBR=antonm,jar

Review URL: http://codereview.chromium.org/597040

TBR=glider@chromium.org
Review URL: http://codereview.chromium.org/598064

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38772 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 25 deletions

diff --git a/third_party/tcmalloc/chromium/src/malloc_hook.cc b/third_party/tcmalloc/chromium/src/malloc_hook.cc
index 2a7f542..d1ad12a 100644
--- a/third_party/tcmalloc/chromium/src/malloc_hook.cc
+++ b/third_party/tcmalloc/chromium/src/malloc_hook.cc
@@ -423,7 +423,7 @@ static inline void* do_mmap64(void *start, size_t length,
   return result;
 }
 
-# endif  // defined(__x86_64__)
+# endif
 
 // We use do_mmap64 abstraction to put MallocHook::InvokeMmapHook
 // calls right into mmap and mmap64, so that the stack frames in the caller's
@@ -472,7 +472,7 @@ extern "C" void* mmap(void *start, size_t length, int prot, int flags,
   return result;
 }
 
-#endif  // !defined(__USE_FILE_OFFSET64) || !defined(__REDIRECT_NTH)
+#endif
 
 extern "C" int munmap(void* start, size_t length) __THROW {
   MallocHook::InvokeMunmapHook(start, length);
@@ -501,26 +501,4 @@ extern "C" void* sbrk(ptrdiff_t increment) __THROW {
   return result;
 }
 
-/*static*/void* MallocHook::UnhookedMMap(void *start, size_t length, int prot,
-                                         int flags, int fd, off_t offset) {
-  return do_mmap64(start, length, prot, flags, fd, offset);
-}
-
-/*static*/int MallocHook::UnhookedMUnmap(void *start, size_t length) {
-  return sys_munmap(start, length);
-}
-
-#else   // defined(__linux) &&
-        // (defined(__i386__) || defined(__x86_64__) || defined(__PPC__))
-
-/*static*/void* MallocHook::UnhookedMMap(void *start, size_t length, int prot,
-                                         int flags, int fd, off_t offset) {
-  return mmap(start, length, prot, flags, fd, offset);
-}
-
-/*static*/int MallocHook::UnhookedMUnmap(void *start, size_t length) {
-  return munmap(start, length);
-}
-
-#endif  // defined(__linux) &&
-        // (defined(__i386__) || defined(__x86_64__) || defined(__PPC__))
+#endif