diff options
| author | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
|---|---|---|
| committer | Douglas Anderson <dianders@chromium.org> | 2022-01-05 16:13:50 -0800 |
| commit | f757b390faab6c38fe0887dc2123dcb615e21953 (patch) | |
| tree | bd3a7c81a775c362693bccaf00e2cef9e07e2eea /include | |
| parent | 443c053f51f9173042a2b45d0db7271cebe78198 (diff) | |
| parent | 4c82fd0506b4cc196a375d1200361fb0c5439acd (diff) | |
Merge remote-tracking branch 'drm-intel/topic/core-for-CI' into drm-tip
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/lockdep.h | 4 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h index 467b94257105..9023ee07bf6a 100644 --- a/include/linux/lockdep.h +++ b/include/linux/lockdep.h @@ -138,8 +138,8 @@ struct held_lock { unsigned int read:2; /* see lock_acquire() comment */ unsigned int check:1; /* see lock_acquire() comment */ unsigned int hardirqs_off:1; - unsigned int references:12; /* 32 bits */ - unsigned int pin_count; + unsigned int pin_count:12; /* 32 bits */ + unsigned int references; }; /* diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index bd8860eeb291..45f20a518db0 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -164,11 +164,12 @@ enum perf_event_sample_format { PERF_SAMPLE_WEIGHT_STRUCT = 1U << 24, PERF_SAMPLE_MAX = 1U << 25, /* non-ABI */ - - __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ }; #define PERF_SAMPLE_WEIGHT_TYPE (PERF_SAMPLE_WEIGHT | PERF_SAMPLE_WEIGHT_STRUCT) + +#define __PERF_SAMPLE_CALLCHAIN_EARLY (1ULL << 63) /* non-ABI; internal use */ + /* * values to program into branch_sample_type when PERF_SAMPLE_BRANCH is set * |