← Back to branch summary

~ubuntu-branches/ubuntu/wily/ust/wily-proposed

« back to all changes in this revision

Viewing changes to include/lttng/tracepoint-types.h

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2015-06-24 14:18:03 UTC
  • mfrom: (11.2.11 sid)
  • Revision ID: package-import@ubuntu.com-20150624141803-zfj6xzpr7dlxiysg
Tags: 2.6.2-1ubuntu1
https://launchpad.net/bugs/1468345
http://bugs.debian.org/789790
* Merge from Debian unstable. (LP: #1468345) Remaining changes:
  - debian/control, debian/patches/use-python3.patch:
    + Switch to use python3. (Closes: #789790)
* Drop following changes, fixed in Debian / upstream:
  - debian/patches/0001-Add-aarch64-host-cpu-in-configure.ac.patch:
    + Add arm64 host_cpu stanzas in configure.ac
  - debian/liblttng-ust0.symbols:
    + Update symbols file.
  - debian/control:
    + Enable builds on arm64 and ppc64el.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/lttng/tracepoint-types.h
23
23
 * SOFTWARE.
24
24
 */
25
25
 
26
 
struct tracepoint_probe {
 
26
struct lttng_ust_tracepoint_probe {
27
27
        void (*func)(void);
28
28
        void *data;
29
29
};
30
30
 
31
 
#define TRACEPOINT_PADDING      16
32
 
struct tracepoint {
 
31
#define LTTNG_UST_TRACEPOINT_PADDING    16
 
32
struct lttng_ust_tracepoint {
33
33
        const char *name;
34
34
        int state;
35
 
        struct tracepoint_probe *probes;
 
35
        struct lttng_ust_tracepoint_probe *probes;
36
36
        int *tracepoint_provider_ref;
37
37
        const char *signature;
38
 
        char padding[TRACEPOINT_PADDING];
 
38
        char padding[LTTNG_UST_TRACEPOINT_PADDING];
39
39
};
40
40
 
41
41
#endif /* _LTTNG_TRACEPOINT_TYPES_H */