diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:07:05 +0300 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 12:07:05 +0300 |
| commit | b11918bdbe79bd002d00a9f1d78958167ccfad99 (patch) | |
| tree | 931c5680a242041f49b07b20823012ae9bdb98c2 /include/linux/ipc.h | |
| parent | d3c7ad2432115b0b53fb838c14b8ad9ad72f7254 (diff) | |
| parent | 0152b29c89650654abf4f0e96bbf2566b85ae55d (diff) | |
| download | linux-b11918bdbe79bd002d00a9f1d78958167ccfad99.tar.xz | |
Merge branch 'for-4.14/battery' into for-linus
- support for batteries driven by HID input reports, from Dmitry Torokhov
Diffstat (limited to 'include/linux/ipc.h')
| -rw-r--r-- | include/linux/ipc.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/ipc.h b/include/linux/ipc.h index 71fd92d81b26..fadd579d577d 100644 --- a/include/linux/ipc.h +++ b/include/linux/ipc.h @@ -20,6 +20,9 @@ struct kern_ipc_perm { umode_t mode; unsigned long seq; void *security; -} ____cacheline_aligned_in_smp; + + struct rcu_head rcu; + atomic_t refcount; +} ____cacheline_aligned_in_smp __randomize_layout; #endif /* _LINUX_IPC_H */ |