diff options
| author | Greg Kroah-Hartman | 2016-02-01 21:53:14 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-02-01 21:53:14 +0100 |
| commit | 6e9131cc43a672003a75483d9b9db5c51015ae5f (patch) | |
| tree | 23deb539a695272dc9f003b4ab094037ccc10f31 /drivers/xen | |
| parent | tty: Remove ASYNC_CLOSING (diff) | |
| parent | Linux 4.5-rc2 (diff) | |
| download | kernel-qcow2-linux-6e9131cc43a672003a75483d9b9db5c51015ae5f.tar.gz kernel-qcow2-linux-6e9131cc43a672003a75483d9b9db5c51015ae5f.tar.xz kernel-qcow2-linux-6e9131cc43a672003a75483d9b9db5c51015ae5f.zip | |
Merge 4.5-rc2 into tty-next
We want the tty/serial fixes in here as well to make merges easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/tmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c index 945fc4327201..4ac2ca8a7656 100644 --- a/drivers/xen/tmem.c +++ b/drivers/xen/tmem.c @@ -242,7 +242,7 @@ static int tmem_cleancache_init_shared_fs(char *uuid, size_t pagesize) return xen_tmem_new_pool(shared_uuid, TMEM_POOL_SHARED, pagesize); } -static struct cleancache_ops tmem_cleancache_ops = { +static const struct cleancache_ops tmem_cleancache_ops = { .put_page = tmem_cleancache_put_page, .get_page = tmem_cleancache_get_page, .invalidate_page = tmem_cleancache_flush_page, |