From: Julian Seward <jseward@acm.org>
Date: Sat, 26 Apr 2003 21:49:40 +0000 (+0000)
Subject: Support kernels >= 2.5.68 (Anders Gustafsson <andersg@0x63.nu>)
X-Git-Tag: svn/VALGRIND_2_0_0~195
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85291a44d9a60cf8a368e72129dfb133af7500c0;p=thirdparty%2Fvalgrind.git

Support kernels >= 2.5.68 (Anders Gustafsson <andersg@0x63.nu>)

MERGE TO STABLE


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@1564
---

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 3ac4413d18..3ac5c331fd 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -796,8 +796,20 @@ static void process_cmd_line_options ( void )
            && sp[-2] == VKI_AT_HWCAP
            && sp[-4-1] == 0) {
           if (0)
-             VG_(printf)("Looks like a >> 2.5.43 kernel here.\n");
+             VG_(printf)("Looks like a 2.5.43-2.5.67 kernel here.\n");
           sp -= 4;
+       } else
+       if (sp[2] == VKI_AT_CLKTCK
+           && sp[0] == VKI_AT_PAGESZ
+           && sp[-2] == VKI_AT_HWCAP
+           && sp[-6] == VKI_AT_SYSINFO
+           && sp[-6-1] == 0) {
+          if (0)
+             VG_(printf)("Looks like a >= 2.5.68 kernel with "
+                         "a sysinfo page at %x here.\n", sp[-5]);
+	  VG_(sysinfo_page_exists) = True;
+	  VG_(sysinfo_page_addr) = sp[-5];
+          sp -= 6;
        } else
          args_grok_error(
             "ELF frame does not look like 2.2.X or 2.4.X.\n   "