diff options
| author | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2014-04-15 09:57:50 +0800 |
| commit | dc65fae3f730b6a1888f5559d68e59111f013c4f (patch) | |
| tree | 019e33c310553116b5b64042820bfb007b0fa832 /include | |
| parent | 5ad6d9ba813e2a36b624970f7e5beb4e12641bee (diff) | |
| parent | f512eefd5cde0ad21bd99bbfe4dc70b62805838e (diff) | |
Merge tag 'v3.10.37' into linux-linaro-lsk
This is the 3.10.37 stable release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cpufreq.h | 1 | ||||
| -rw-r--r-- | include/linux/futex.h | 4 | ||||
| -rw-r--r-- | include/linux/usb/usbnet.h | 2 | ||||
| -rw-r--r-- | include/net/sock.h | 5 |
4 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 037d36ae63e..1a81b7470bc 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -107,6 +107,7 @@ struct cpufreq_policy { unsigned int policy; /* see above */ struct cpufreq_governor *governor; /* see below */ void *governor_data; + bool governor_enabled; /* governor start/stop flag */ struct work_struct update; /* if update_policy() needs to be * called, but you're in IRQ context */ diff --git a/include/linux/futex.h b/include/linux/futex.h index b0d95cac826..6435f46d6e1 100644 --- a/include/linux/futex.h +++ b/include/linux/futex.h @@ -55,7 +55,11 @@ union futex_key { #ifdef CONFIG_FUTEX extern void exit_robust_list(struct task_struct *curr); extern void exit_pi_state_list(struct task_struct *curr); +#ifdef CONFIG_HAVE_FUTEX_CMPXCHG +#define futex_cmpxchg_enabled 1 +#else extern int futex_cmpxchg_enabled; +#endif #else static inline void exit_robust_list(struct task_struct *curr) { diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h index f18d64129f9..123b21bef1b 100644 --- a/include/linux/usb/usbnet.h +++ b/include/linux/usb/usbnet.h @@ -30,7 +30,7 @@ struct usbnet { struct driver_info *driver_info; const char *driver_name; void *driver_priv; - wait_queue_head_t *wait; + wait_queue_head_t wait; struct mutex phy_mutex; unsigned char suspend_count; unsigned char pkt_cnt, pkt_err; diff --git a/include/net/sock.h b/include/net/sock.h index cec4c723db9..8f32b779bc8 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1437,6 +1437,11 @@ static inline void sk_wmem_free_skb(struct sock *sk, struct sk_buff *skb) */ #define sock_owned_by_user(sk) ((sk)->sk_lock.owned) +static inline void sock_release_ownership(struct sock *sk) +{ + sk->sk_lock.owned = 0; +} + /* * Macro so as to not evaluate some arguments when * lockdep is not enabled. |