← Back to branch summary

~ubuntu-branches/debian/wheezy/linux-2.6/wheezy

« back to all changes in this revision

Viewing changes to tools/perf/util/build-id.c

  • Committer: Bazaar Package Importer
  • Author(s): Ben Hutchings, Ben Hutchings, Aurelien Jarno
  • Date: 2011-06-07 12:14:05 UTC
  • mfrom: (43.1.9 sid)
  • Revision ID: james.westby@ubuntu.com-20110607121405-i3h1rd7nrnd2b73h
Tags: 2.6.39-2
http://bugs.debian.org/627492
http://bugs.debian.org/596626
http://bugs.debian.org/628932
http://bugs.debian.org/628191
http://bugs.debian.org/627837
http://bugs.debian.org/622997
http://bugs.debian.org/622745
http://bugs.debian.org/619827
http://bugs.debian.org/629401
[ Ben Hutchings ]
* [x86] Enable BACKLIGHT_APPLE, replacing BACKLIGHT_MBP_NVIDIA
  (Closes: #627492)
* cgroups: Disable memory resource controller by default. Allow it
  to be enabled using kernel parameter 'cgroup_enable=memory'.
* rt2800usb: Enable support for more USB devices including
  Linksys WUSB600N (Closes: #596626) (this change was accidentally
  omitted from 2.6.39-1)
* [x86] Remove Celeron from list of processors supporting PAE. Most
  'Celeron M' models do not.
* Update debconf template translations:
  - Swedish (Martin Bagge) (Closes: #628932)
  - French (David Prévot) (Closes: #628191)
* aufs: Update for 2.6.39 (Closes: #627837)
* Add stable 2.6.39.1, including:
  - ext4: dont set PageUptodate in ext4_end_bio()
  - pata_cmd64x: fix boot crash on parisc (Closes: #622997, #622745)
  - ext3: Fix fs corruption when make_indexed_dir() fails
  - netfilter: nf_ct_sip: validate Content-Length in TCP SIP messages
  - sctp: fix race between sctp_bind_addr_free() and
    sctp_bind_addr_conflict()
  - sctp: fix memory leak of the ASCONF queue when free asoc
  - md/bitmap: fix saving of events_cleared and other state
  - cdc_acm: Fix oops when Droids MuIn LCD is connected
  - cx88: Fix conversion from BKL to fine-grained locks (Closes: #619827)
  - keys: Set cred->user_ns in key_replace_session_keyring (CVE-2011-2184)
  - tmpfs: fix race between truncate and writepage
  - nfs41: Correct offset for LAYOUTCOMMIT
  - xen/mmu: fix a race window causing leave_mm BUG()
  - ext4: fix possible use-after-free in ext4_remove_li_request()
  For the complete list of changes, see:
   http://www.kernel.org/pub/linux/kernel/v2.6/ChangeLog-2.6.39.1
* Bump ABI to 2
* netfilter: Enable IP_SET, IP_SET_BITMAP_IP, IP_SET_BITMAP_IPMAC,
  IP_SET_BITMAP_PORT, IP_SET_HASH_IP, IP_SET_HASH_IPPORT,
  IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
  IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
  (Closes: #629401)

[ Aurelien Jarno ]
* [mipsel/loongson-2f] Disable_SCSI_LPFC to workaround GCC ICE.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/perf/util/build-id.c
14
14
#include <linux/kernel.h>
15
15
#include "debug.h"
16
16
 
17
 
static int build_id__mark_dso_hit(event_t *event,
18
 
                                  struct sample_data *sample __used,
 
17
static int build_id__mark_dso_hit(union perf_event *event,
 
18
                                  struct perf_sample *sample __used,
 
19
                                  struct perf_evsel *evsel __used,
19
20
                                  struct perf_session *session)
20
21
{
21
22
        struct addr_location al;
37
38
        return 0;
38
39
}
39
40
 
40
 
static int event__exit_del_thread(event_t *self, struct sample_data *sample __used,
41
 
                                  struct perf_session *session)
 
41
static int perf_event__exit_del_thread(union perf_event *event,
 
42
                                       struct perf_sample *sample __used,
 
43
                                       struct perf_session *session)
42
44
{
43
 
        struct thread *thread = perf_session__findnew(session, self->fork.tid);
 
45
        struct thread *thread = perf_session__findnew(session, event->fork.tid);
44
46
 
45
 
        dump_printf("(%d:%d):(%d:%d)\n", self->fork.pid, self->fork.tid,
46
 
                    self->fork.ppid, self->fork.ptid);
 
47
        dump_printf("(%d:%d):(%d:%d)\n", event->fork.pid, event->fork.tid,
 
48
                    event->fork.ppid, event->fork.ptid);
47
49
 
48
50
        if (thread) {
49
51
                rb_erase(&thread->rb_node, &session->threads);
56
58
 
57
59
struct perf_event_ops build_id__mark_dso_hit_ops = {
58
60
        .sample = build_id__mark_dso_hit,
59
 
        .mmap   = event__process_mmap,
60
 
        .fork   = event__process_task,
61
 
        .exit   = event__exit_del_thread,
 
61
        .mmap   = perf_event__process_mmap,
 
62
        .fork   = perf_event__process_task,
 
63
        .exit   = perf_event__exit_del_thread,
62
64
};
63
65
 
64
66
char *dso__build_id_filename(struct dso *self, char *bf, size_t size)