From af66caaafc408fe33f6cb9b8daac1311bda438db Mon Sep 17 00:00:00 2001 From: Manfred Spraul Date: Wed, 26 May 2010 14:43:42 -0700 Subject: [PATCH] --- yaml --- r: 198785 b: refs/heads/master c: 31a7c4746e9925512afab30557dd445d677cc802 h: refs/heads/master i: 198783: 33c2bbbfc4734f0b0010c00a4b8e3a28341a36c8 v: v3 --- [refs] | 2 +- trunk/include/linux/sem.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 #include +#include 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 */