aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Murphy2013-05-08 13:36:01 -0500
committerDan Murphy2013-05-08 13:36:01 -0500
commit1c1c1e66b5dc8ae89a416d1da5118900cd15219f (patch)
tree64c670d11dee77df94cd2c93ee86c637281b137a /include
parent935f6c2f82056d538b528272e2bdbb5c08d69a58 (diff)
parent9c9ab76c48ffc48648c8e5da40d57965fc65c030 (diff)
downloadkernel-audio-1c1c1e66b5dc8ae89a416d1da5118900cd15219f.tar.gz
kernel-audio-1c1c1e66b5dc8ae89a416d1da5118900cd15219f.tar.xz
kernel-audio-1c1c1e66b5dc8ae89a416d1da5118900cd15219f.zip
Merge tag 'v3.8.12' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.8.y
* tag 'v3.8.12' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (104 commits) Linux 3.8.12 mfd: adp5520: Restore mode bits on resume rcutrace: single_open() leaks mmc: atmel-mci: pio hang on block errors mmc: core: Fix bit width test failing on old eMMC cards x86: Eliminate irq_mis_count counted in arch_irq_stat KVM: X86 emulator: fix source operand decoding for 8bit mov[zs]x instructions Give the OID registry file module info to avoid kernel tainting mmc: at91/avr32/atmel-mci: fix DMA-channel leak on module unload ext4: fix Kconfig documentation for CONFIG_EXT4_DEBUG ext4: fix online resizing for ext3-compat file systems ext4: fix big-endian bug in metadata checksum calculations ext4: fix journal callback list traversal jbd2: fix race between jbd2_journal_remove_checkpoint and ->j_commit_callback ext4/jbd2: don't wait (forever) for stale tid caused by wraparound ixgbe: fix EICR write in ixgbe_msix_other ipc: sysv shared memory limited to 8TiB wireless: regulatory: fix channel disabling race condition nfsd: Decode and send 64bit time values nfsd: don't run get_file if nfs4_preprocess_stateid_op return error ... Signed-off-by: Dan Murphy <dmurphy@ti.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/cgroup.h3
-rw-r--r--include/linux/ipc_namespace.h2
-rw-r--r--include/linux/jbd2.h2
-rw-r--r--include/linux/sched.h18
-rw-r--r--include/sound/emu10k1.h1
5 files changed, 8 insertions, 18 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 7d73905dcba2..2322df701519 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -303,9 +303,6 @@ struct cftype {
303 /* CFTYPE_* flags */ 303 /* CFTYPE_* flags */
304 unsigned int flags; 304 unsigned int flags;
305 305
306 /* file xattrs */
307 struct simple_xattrs xattrs;
308
309 int (*open)(struct inode *inode, struct file *file); 306 int (*open)(struct inode *inode, struct file *file);
310 ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft, 307 ssize_t (*read)(struct cgroup *cgrp, struct cftype *cft,
311 struct file *file, 308 struct file *file,
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h
index ae221a7b5092..c4d870b0d5e6 100644
--- a/include/linux/ipc_namespace.h
+++ b/include/linux/ipc_namespace.h
@@ -43,8 +43,8 @@ struct ipc_namespace {
43 43
44 size_t shm_ctlmax; 44 size_t shm_ctlmax;
45 size_t shm_ctlall; 45 size_t shm_ctlall;
46 unsigned long shm_tot;
46 int shm_ctlmni; 47 int shm_ctlmni;
47 int shm_tot;
48 /* 48 /*
49 * Defines whether IPC_RMID is forced for _all_ shm segments regardless 49 * Defines whether IPC_RMID is forced for _all_ shm segments regardless
50 * of shmctl() 50 * of shmctl()
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
index e30b66346942..383bef083281 100644
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
@@ -498,6 +498,7 @@ struct transaction_s
498 T_COMMIT, 498 T_COMMIT,
499 T_COMMIT_DFLUSH, 499 T_COMMIT_DFLUSH,
500 T_COMMIT_JFLUSH, 500 T_COMMIT_JFLUSH,
501 T_COMMIT_CALLBACK,
501 T_FINISHED 502 T_FINISHED
502 } t_state; 503 } t_state;
503 504
@@ -1210,6 +1211,7 @@ int __jbd2_log_start_commit(journal_t *journal, tid_t tid);
1210int jbd2_journal_start_commit(journal_t *journal, tid_t *tid); 1211int jbd2_journal_start_commit(journal_t *journal, tid_t *tid);
1211int jbd2_journal_force_commit_nested(journal_t *journal); 1212int jbd2_journal_force_commit_nested(journal_t *journal);
1212int jbd2_log_wait_commit(journal_t *journal, tid_t tid); 1213int jbd2_log_wait_commit(journal_t *journal, tid_t tid);
1214int jbd2_complete_transaction(journal_t *journal, tid_t tid);
1213int jbd2_log_do_checkpoint(journal_t *journal); 1215int jbd2_log_do_checkpoint(journal_t *journal);
1214int jbd2_trans_will_send_data_barrier(journal_t *journal, tid_t tid); 1216int jbd2_trans_will_send_data_barrier(journal_t *journal, tid_t tid);
1215 1217
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 7e492701142e..f5ad26ec741b 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -2486,27 +2486,18 @@ static inline void threadgroup_change_end(struct task_struct *tsk)
2486 * 2486 *
2487 * Lock the threadgroup @tsk belongs to. No new task is allowed to enter 2487 * Lock the threadgroup @tsk belongs to. No new task is allowed to enter
2488 * and member tasks aren't allowed to exit (as indicated by PF_EXITING) or 2488 * and member tasks aren't allowed to exit (as indicated by PF_EXITING) or
2489 * perform exec. This is useful for cases where the threadgroup needs to 2489 * change ->group_leader/pid. This is useful for cases where the threadgroup
2490 * stay stable across blockable operations. 2490 * needs to stay stable across blockable operations.
2491 * 2491 *
2492 * fork and exit paths explicitly call threadgroup_change_{begin|end}() for 2492 * fork and exit paths explicitly call threadgroup_change_{begin|end}() for
2493 * synchronization. While held, no new task will be added to threadgroup 2493 * synchronization. While held, no new task will be added to threadgroup
2494 * and no existing live task will have its PF_EXITING set. 2494 * and no existing live task will have its PF_EXITING set.
2495 * 2495 *
2496 * During exec, a task goes and puts its thread group through unusual 2496 * de_thread() does threadgroup_change_{begin|end}() when a non-leader
2497 * changes. After de-threading, exclusive access is assumed to resources 2497 * sub-thread becomes a new leader.
2498 * which are usually shared by tasks in the same group - e.g. sighand may
2499 * be replaced with a new one. Also, the exec'ing task takes over group
2500 * leader role including its pid. Exclude these changes while locked by
2501 * grabbing cred_guard_mutex which is used to synchronize exec path.
2502 */ 2498 */
2503static inline void threadgroup_lock(struct task_struct *tsk) 2499static inline void threadgroup_lock(struct task_struct *tsk)
2504{ 2500{
2505 /*
2506 * exec uses exit for de-threading nesting group_rwsem inside
2507 * cred_guard_mutex. Grab cred_guard_mutex first.
2508 */
2509 mutex_lock(&tsk->signal->cred_guard_mutex);
2510 down_write(&tsk->signal->group_rwsem); 2501 down_write(&tsk->signal->group_rwsem);
2511} 2502}
2512 2503
@@ -2519,7 +2510,6 @@ static inline void threadgroup_lock(struct task_struct *tsk)
2519static inline void threadgroup_unlock(struct task_struct *tsk) 2510static inline void threadgroup_unlock(struct task_struct *tsk)
2520{ 2511{
2521 up_write(&tsk->signal->group_rwsem); 2512 up_write(&tsk->signal->group_rwsem);
2522 mutex_unlock(&tsk->signal->cred_guard_mutex);
2523} 2513}
2524#else 2514#else
2525static inline void threadgroup_change_begin(struct task_struct *tsk) {} 2515static inline void threadgroup_change_begin(struct task_struct *tsk) {}
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h
index f841ba4bacb8..dfb42ca6d043 100644
--- a/include/sound/emu10k1.h
+++ b/include/sound/emu10k1.h
@@ -1787,6 +1787,7 @@ struct snd_emu10k1 {
1787 unsigned int next_free_voice; 1787 unsigned int next_free_voice;
1788 1788
1789 const struct firmware *firmware; 1789 const struct firmware *firmware;
1790 const struct firmware *dock_fw;
1790 1791
1791#ifdef CONFIG_PM_SLEEP 1792#ifdef CONFIG_PM_SLEEP
1792 unsigned int *saved_ptr; 1793 unsigned int *saved_ptr;