diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-06-27 22:26:44 +0200 |
| commit | a976c2951d8f376112361830aa7762beff83a205 (patch) | |
| tree | 24f6647aedd4b570cb67f3195962f5c8a040c824 /include/linux/sem.h | |
| parent | 83848fbe7e6af978c080a88c130a67178b1ac0e4 (diff) | |
| parent | 16b9951f656ea8f2b47546bd898325a7e256932f (diff) | |
| download | lwn-a976c2951d8f376112361830aa7762beff83a205.tar.gz lwn-a976c2951d8f376112361830aa7762beff83a205.zip | |
Merge back ACPICA material for v4.13.
Diffstat (limited to 'include/linux/sem.h')
| -rw-r--r-- | include/linux/sem.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 */ |