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 3ac4413d18e18b55b6080fb485a945d6b671d569..3ac5c331fde822121cb287f3183c5c8e8d3ff0e3 100644 (file)
--- 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   "