diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-12-18 16:11:27 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-12-18 16:11:27 -0800 |
| commit | 361feeef4f86ebcedf04c8c43484bf72d3997f71 (patch) | |
| tree | 540b68152d5b918def47836244d8f023a3c47497 /include/linux | |
| parent | 897db080e2b96fff7c64ba0f80909dfac9efbc5a (diff) | |
| parent | ed2e942319ca738ea01e6de6e416ecd1b4b44147 (diff) | |
Merge "Merge android-4.4.167 (ad9ce19) into msm-4.4"
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 7 | ||||
| -rw-r--r-- | include/linux/usb.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 8f6894c6e83c..ded334b5cf8d 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -3082,7 +3082,12 @@ static inline void set_task_comm(struct task_struct *tsk, const char *from) { __set_task_comm(tsk, from, false); } -extern char *get_task_comm(char *to, struct task_struct *tsk); + +extern char *__get_task_comm(char *to, size_t len, struct task_struct *tsk); +#define get_task_comm(buf, tsk) ({ \ + BUILD_BUG_ON(sizeof(buf) != TASK_COMM_LEN); \ + __get_task_comm(buf, sizeof(buf), tsk); \ +}) #ifdef CONFIG_SMP void scheduler_ipi(void); diff --git a/include/linux/usb.h b/include/linux/usb.h index d88c31c8e6a4..e27df29a298e 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -336,11 +336,11 @@ struct usb_host_bos { }; int __usb_get_extra_descriptor(char *buffer, unsigned size, - unsigned char type, void **ptr); + unsigned char type, void **ptr, size_t min); #define usb_get_extra_descriptor(ifpoint, type, ptr) \ __usb_get_extra_descriptor((ifpoint)->extra, \ (ifpoint)->extralen, \ - type, (void **)ptr) + type, (void **)ptr, sizeof(**(ptr))) /* ----------------------------------------------------------------------- */ |