diff options
| author | ddomingo <ddomingo@redhat.com> | 2008-11-27 11:34:24 +1000 |
|---|---|---|
| committer | ddomingo <ddomingo@redhat.com> | 2008-11-27 11:34:24 +1000 |
| commit | ad970c8448ceeb844846251d994b5946e68be184 (patch) | |
| tree | fdc2c3eba4d9b7d66e82871c927be4b940a7a0d2 /runtime | |
| parent | 218a165500487ccdba0d654221909f362efb09b9 (diff) | |
| parent | 224e23bef7a46c823c4b3d41efdf9dbf98853ed0 (diff) | |
| download | systemtap-steved-ad970c8448ceeb844846251d994b5946e68be184.tar.gz systemtap-steved-ad970c8448ceeb844846251d994b5946e68be184.tar.xz systemtap-steved-ad970c8448ceeb844846251d994b5946e68be184.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/ChangeLog | 6 | ||||
| -rw-r--r-- | runtime/sym.c | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/runtime/ChangeLog b/runtime/ChangeLog index f3c5f2e3..93ee18d2 100644 --- a/runtime/ChangeLog +++ b/runtime/ChangeLog @@ -1,5 +1,11 @@ 2008-11-26 Frank Ch. Eigler <fche@elastic.org> + PR 4886. + * sym.c (_stp_module_check): Perform assertive + build-id checking for kernel versions >= 2.6.27. + +2008-11-26 Frank Ch. Eigler <fche@elastic.org> + * autoconf-synchronize-sched.c: New file. 2008-11-25 Frank Ch. Eigler <fche@elastic.org> diff --git a/runtime/sym.c b/runtime/sym.c index d7b079d2..06ac14a5 100644 --- a/runtime/sym.c +++ b/runtime/sym.c @@ -205,14 +205,23 @@ static int _stp_module_check(void) /* XXX: consider using kread() instead of above. */ if (theory != practice) { + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) + _stp_error ("%s: inconsistent %s build-id byte #%d " + "(0x%x [actual] vs. 0x%x [debuginfo])\n", + THIS_MODULE->name, m->name, j, + practice, theory); + return 1; + #else + /* This branch is a surrogate for + kernels affected by Fedora bug + #465873. */ printk(KERN_WARNING "%s: inconsistent %s build-id byte #%d " "(0x%x [actual] vs. 0x%x [debuginfo])\n", THIS_MODULE->name, m->name, j, practice, theory); break; /* Note just the first mismatch. */ - /* XXX: If it were not for Fedora bug #465873, - we could "return 1;" here to abort the script. */ + #endif } } } |