diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-19 06:23:45 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-19 06:23:45 (GMT) |
| commit | 4952236dd774bbfd6dcbc03de9ddf550a141d3ad (patch) | |
| tree | 2657a529be18b35debe607efad4b13fc0e319238 /include | |
| parent | 79047d9361dba60cc5a713f6c82874f412618b22 (diff) | |
| parent | 5d7a76acad403638f635c918cc63d1d44ffa4065 (diff) | |
| download | linux-4952236dd774bbfd6dcbc03de9ddf550a141d3ad.tar.xz | |
Merge tag 'v4.9.57' into linux-linaro-lsk-v4.9
This is the 4.9.57 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/buffer_head.h | 1 | ||||
| -rw-r--r-- | include/sound/seq_virmidi.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index ebbacd1..447a915 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h @@ -226,6 +226,7 @@ int generic_write_end(struct file *, struct address_space *, loff_t, unsigned, unsigned, struct page *, void *); void page_zero_new_buffers(struct page *page, unsigned from, unsigned to); +void clean_page_buffers(struct page *page); int cont_write_begin(struct file *, struct address_space *, loff_t, unsigned, unsigned, struct page **, void **, get_block_t *, loff_t *); diff --git a/include/sound/seq_virmidi.h b/include/sound/seq_virmidi.h index a03acd0..695257a 100644 --- a/include/sound/seq_virmidi.h +++ b/include/sound/seq_virmidi.h @@ -60,6 +60,7 @@ struct snd_virmidi_dev { int port; /* created/attached port */ unsigned int flags; /* SNDRV_VIRMIDI_* */ rwlock_t filelist_lock; + struct rw_semaphore filelist_sem; struct list_head filelist; }; |