diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-16 11:40:28 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2021-08-16 11:40:28 +0000 |
| commit | 49dc55b9cb46c392ba3fdfe4deeb04cb6f8035c3 (patch) | |
| tree | 427dcf1cba800606a279d9ac4025e00df97667a1 /include | |
| parent | bbdb668ff5762f9a89f29fd88b5393b696499f38 (diff) | |
| parent | a998faa9c4cee7dc68f3f6f82be93bbb99dda322 (diff) | |
Merge tag 'v5.4.140' into 5.4-2.3.x-imx
This is the 5.4.140 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tee_drv.h | 1 | ||||
| -rw-r--r-- | include/linux/usb/otg-fsm.h | 1 | ||||
| -rw-r--r-- | include/net/bluetooth/hci_core.h | 1 | ||||
| -rw-r--r-- | include/net/ip6_route.h | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 8ea3de440a8c..242f119529bb 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -336,6 +336,7 @@ void *tee_get_drvdata(struct tee_device *teedev); * @returns a pointer to 'struct tee_shm' */ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags); +struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size); /** * tee_shm_priv_alloc() - Allocate shared memory privately diff --git a/include/linux/usb/otg-fsm.h b/include/linux/usb/otg-fsm.h index 1a0155ff051e..012a7116782f 100644 --- a/include/linux/usb/otg-fsm.h +++ b/include/linux/usb/otg-fsm.h @@ -197,6 +197,7 @@ struct otg_fsm { struct mutex lock; u8 *host_req_flag; struct delayed_work hnp_polling_work; + bool hnp_work_inited; bool state_changed; }; diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h index ba0e092fd10c..594c21fb325f 100644 --- a/include/net/bluetooth/hci_core.h +++ b/include/net/bluetooth/hci_core.h @@ -1057,6 +1057,7 @@ struct hci_dev *hci_alloc_dev(void); void hci_free_dev(struct hci_dev *hdev); int hci_register_dev(struct hci_dev *hdev); void hci_unregister_dev(struct hci_dev *hdev); +void hci_cleanup_dev(struct hci_dev *hdev); int hci_suspend_dev(struct hci_dev *hdev); int hci_resume_dev(struct hci_dev *hdev); int hci_reset_dev(struct hci_dev *hdev); diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index feeecbc80e72..2c739fc752e1 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -263,7 +263,7 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, static inline unsigned int ip6_skb_dst_mtu(struct sk_buff *skb) { - int mtu; + unsigned int mtu; struct ipv6_pinfo *np = skb->sk && !dev_recursion_level() ? inet6_sk(skb->sk) : NULL; |