diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-10-04 04:03:49 (GMT) |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-10-04 04:03:49 (GMT) |
| commit | a38b2dd146c0bba28633fe857f0c4626e0c691cc (patch) | |
| tree | 2d81121c3690a36a3679bc78552067eee74c2c81 /include | |
| parent | 7ecc9777c5c76d7b31c376ffd4f59c4a85472a1b (diff) | |
| parent | d59dabdc4cb380b79c965af28cd4ba001f04834b (diff) | |
| download | linux-a38b2dd146c0bba28633fe857f0c4626e0c691cc.tar.xz | |
Merge tag 'v4.9.52' into linux-linaro-lsk-v4.9
This is the 4.9.52 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/ccp.h | 3 | ||||
| -rw-r--r-- | include/linux/sunrpc/svc.h | 1 | ||||
| -rw-r--r-- | include/linux/tty_flip.h | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/ccp.h b/include/linux/ccp.h index edc5d04..1cfe5ef 100644 --- a/include/linux/ccp.h +++ b/include/linux/ccp.h @@ -1,7 +1,7 @@ /* * AMD Cryptographic Coprocessor (CCP) driver * - * Copyright (C) 2013,2016 Advanced Micro Devices, Inc. + * Copyright (C) 2013,2017 Advanced Micro Devices, Inc. * * Author: Tom Lendacky <thomas.lendacky@amd.com> * Author: Gary R Hook <gary.hook@amd.com> @@ -222,6 +222,7 @@ enum ccp_xts_aes_unit_size { * AES operation the new IV overwrites the old IV. */ struct ccp_xts_aes_engine { + enum ccp_aes_type type; enum ccp_aes_action action; enum ccp_xts_aes_unit_size unit_size; diff --git a/include/linux/sunrpc/svc.h b/include/linux/sunrpc/svc.h index 7321ae9..102c84d 100644 --- a/include/linux/sunrpc/svc.h +++ b/include/linux/sunrpc/svc.h @@ -470,6 +470,7 @@ void svc_pool_map_put(void); struct svc_serv * svc_create_pooled(struct svc_program *, unsigned int, struct svc_serv_ops *); int svc_set_num_threads(struct svc_serv *, struct svc_pool *, int); +int svc_set_num_threads_sync(struct svc_serv *, struct svc_pool *, int); int svc_pool_stats_open(struct svc_serv *serv, struct file *file); void svc_destroy(struct svc_serv *); void svc_shutdown_net(struct svc_serv *, struct net *); diff --git a/include/linux/tty_flip.h b/include/linux/tty_flip.h index c28dd52..d43837f 100644 --- a/include/linux/tty_flip.h +++ b/include/linux/tty_flip.h @@ -12,6 +12,7 @@ extern int tty_prepare_flip_string(struct tty_port *port, unsigned char **chars, size_t size); extern void tty_flip_buffer_push(struct tty_port *port); void tty_schedule_flip(struct tty_port *port); +int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag); static inline int tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag) @@ -26,7 +27,7 @@ static inline int tty_insert_flip_char(struct tty_port *port, *char_buf_ptr(tb, tb->used++) = ch; return 1; } - return tty_insert_flip_string_flags(port, &ch, &flag, 1); + return __tty_insert_flip_char(port, ch, flag); } static inline int tty_insert_flip_string(struct tty_port *port, |