Merge tag 'staging-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-block.git] / include / linux / memcontrol.h

diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h
index 9c04cf8e64877a69fe4155a009e63f43b3f96aa6..4f52ec7557254e7a1f2c90dfe4edd63efa6bf8f6 100644 (file)
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
@@ -166,6 +166,15 @@ enum memcg_kmem_state {
        KMEM_ONLINE,
 };
 
+#if defined(CONFIG_SMP)
+struct memcg_padding {
+       char x[0];
+} ____cacheline_internodealigned_in_smp;
+#define MEMCG_PADDING(name)      struct memcg_padding name;
+#else
+#define MEMCG_PADDING(name)
+#endif
+
 /*
  * The memory controller data structure. The memory controller controls both
  * page cache and RSS per cgroup. We would eventually like to provide
@@ -212,7 +221,6 @@ struct mem_cgroup {
        int             oom_kill_disable;
 
        /* memory.events */
-       atomic_long_t memory_events[MEMCG_NR_MEMORY_EVENTS];
        struct cgroup_file events_file;
 
        /* handle for "memory.swap.events" */
@@ -235,19 +243,26 @@ struct mem_cgroup {
         * mem_cgroup ? And what type of charges should we move ?
         */
        unsigned long move_charge_at_immigrate;
+       /* taken only while moving_account > 0 */
+       spinlock_t              move_lock;
+       unsigned long           move_lock_flags;
+
+       MEMCG_PADDING(_pad1_);
+
        /*
         * set > 0 if pages under this cgroup are moving to other cgroup.
         */
        atomic_t                moving_account;
-       /* taken only while moving_account > 0 */
-       spinlock_t              move_lock;
        struct task_struct      *move_lock_task;
-       unsigned long           move_lock_flags;
 
        /* memory.stat */
        struct mem_cgroup_stat_cpu __percpu *stat_cpu;
+
+       MEMCG_PADDING(_pad2_);
+
        atomic_long_t           stat[MEMCG_NR_STAT];
        atomic_long_t           events[NR_VM_EVENT_ITEMS];
+       atomic_long_t memory_events[MEMCG_NR_MEMORY_EVENTS];
 
        unsigned long           socket_pressure;