diff --git a/[refs] b/[refs] index d993e16d6bb9..ce7f655af5eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b578459c3274941156093eba149745e43f93067 +refs/heads/master: 2485e5184452ccbda34ff83883883d9107800dff diff --git a/trunk/include/linux/perf_counter.h b/trunk/include/linux/perf_counter.h index c42455ab1558..dde564517b66 100644 --- a/trunk/include/linux/perf_counter.h +++ b/trunk/include/linux/perf_counter.h @@ -83,7 +83,7 @@ struct perf_counter_hw_event { exclude_hv : 1, /* ditto hypervisor */ exclude_idle : 1, /* don't count when idle */ - __reserved_1 : 55; + __reserved_1 : 54; __u32 extra_config_len; __u32 __reserved_4;