2 files changed, 4 insertions, 6 deletions

diff --git a/include/linux/ipc.h b/include/linux/ipc.h
index 9d84942ae2e5..71fd92d81b26 100644
--- a/include/linux/ipc.h
+++ b/include/linux/ipc.h
@@ -8,8 +8,7 @@
 #define IPCMNI 32768  /* <= MAX_INT limit for ipc arrays (including sysctl changes) */
 
 /* used by in-kernel data structures */
-struct kern_ipc_perm
-{
+struct kern_ipc_perm {
         spinlock_t      lock;
         bool            deleted;
         int             id;
@@ -18,9 +17,9 @@ struct kern_ipc_perm
         kgid_t          gid;
         kuid_t          cuid;
         kgid_t          cgid;
-        umode_t         mode; 
+        umode_t         mode;
         unsigned long   seq;
         void            *security;
-};
+} ____cacheline_aligned_in_smp;
 
 #endif /* _LINUX_IPC_H */
diff --git a/include/linux/sem.h b/include/linux/sem.h
index 4fc222f8755d..9edec926e9d9 100644
--- a/include/linux/sem.h
+++ b/include/linux/sem.h
@@ -10,8 +10,7 @@ struct task_struct;
 
 /* One sem_array data structure for each set of semaphores in the system. */
 struct sem_array {
-        struct kern_ipc_perm    ____cacheline_aligned_in_smp
-                                sem_perm;       /* permissions .. see ipc.h */
+        struct kern_ipc_perm    sem_perm;       /* permissions .. see ipc.h */
         time_t                  sem_ctime;      /* last change time */
         struct sem              *sem_base;      /* ptr to first semaphore in array */
         struct list_head        pending_alter;  /* pending operations */