diff --git a/[refs] b/[refs]
index c5c778baa689..b517b85f0300 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a2b9d4c79671b05956806ede5d054e03ae56280
+refs/heads/master: 31a7c4746e9925512afab30557dd445d677cc802
diff --git a/trunk/include/linux/sem.h b/trunk/include/linux/sem.h
index 8a4adbef8a0f..f2961afa2f66 100644
--- a/trunk/include/linux/sem.h
+++ b/trunk/include/linux/sem.h
@@ -79,6 +79,7 @@ struct  seminfo {
 #ifdef __KERNEL__
 #include <asm/atomic.h>
 #include <linux/rcupdate.h>
+#include <linux/cache.h>
 
 struct task_struct;
 
@@ -91,7 +92,8 @@ struct sem {
 
 /* One sem_array data structure for each set of semaphores in the system. */
 struct sem_array {
-	struct kern_ipc_perm	sem_perm;	/* permissions .. see ipc.h */
+	struct kern_ipc_perm	____cacheline_aligned_in_smp
+				sem_perm;	/* permissions .. see ipc.h */
 	time_t			sem_otime;	/* last semop time */
 	time_t			sem_ctime;	/* last change time */
 	struct sem		*sem_base;	/* ptr to first semaphore in array */