diff options
author | Alex Shi <alex.shi@linaro.org> | 2014-03-28 10:58:52 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2014-03-28 10:58:52 +0800 |
commit | 02e11cd17332186b4cf9ed88db6e63b30043be54 (patch) | |
tree | bc3a5683d5d3139e1825b69796fb8480808ba46f /include | |
parent | d3222d77b27a07a4b200d1b0b792e8e3bdf30396 (diff) | |
parent | 10f8245e0d3650144b034142c8f91e5d15c392ab (diff) |
Merge tag 'v3.10.34' into linux-linaro-lsk
This is 3.10.34 stable release
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/firewire.h | 1 | ||||
-rw-r--r-- | include/linux/jiffies.h | 8 | ||||
-rw-r--r-- | include/linux/tracepoint.h | 6 | ||||
-rw-r--r-- | include/net/tcp.h | 3 | ||||
-rw-r--r-- | include/target/iscsi/iscsi_transport.h | 1 |
5 files changed, 14 insertions, 5 deletions
diff --git a/include/linux/firewire.h b/include/linux/firewire.h index 217e4b42b7c..5d838bf10cb 100644 --- a/include/linux/firewire.h +++ b/include/linux/firewire.h @@ -200,6 +200,7 @@ struct fw_device { unsigned irmc:1; unsigned bc_implemented:2; + work_func_t workfn; struct delayed_work work; struct fw_attribute_group attribute_group; }; diff --git a/include/linux/jiffies.h b/include/linux/jiffies.h index 8fb8edf1241..7b5d4a8ab19 100644 --- a/include/linux/jiffies.h +++ b/include/linux/jiffies.h @@ -101,13 +101,13 @@ static inline u64 get_jiffies_64(void) #define time_after(a,b) \ (typecheck(unsigned long, a) && \ typecheck(unsigned long, b) && \ - ((long)(b) - (long)(a) < 0)) + ((long)((b) - (a)) < 0)) #define time_before(a,b) time_after(b,a) #define time_after_eq(a,b) \ (typecheck(unsigned long, a) && \ typecheck(unsigned long, b) && \ - ((long)(a) - (long)(b) >= 0)) + ((long)((a) - (b)) >= 0)) #define time_before_eq(a,b) time_after_eq(b,a) /* @@ -130,13 +130,13 @@ static inline u64 get_jiffies_64(void) #define time_after64(a,b) \ (typecheck(__u64, a) && \ typecheck(__u64, b) && \ - ((__s64)(b) - (__s64)(a) < 0)) + ((__s64)((b) - (a)) < 0)) #define time_before64(a,b) time_after64(b,a) #define time_after_eq64(a,b) \ (typecheck(__u64, a) && \ typecheck(__u64, b) && \ - ((__s64)(a) - (__s64)(b) >= 0)) + ((__s64)((a) - (b)) >= 0)) #define time_before_eq64(a,b) time_after_eq64(b,a) /* diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index f8e084d0fc7..ba605015c4d 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -60,6 +60,12 @@ struct tp_module { unsigned int num_tracepoints; struct tracepoint * const *tracepoints_ptrs; }; +bool trace_module_has_bad_taint(struct module *mod); +#else +static inline bool trace_module_has_bad_taint(struct module *mod) +{ + return false; +} #endif /* CONFIG_MODULES */ struct tracepoint_iter { diff --git a/include/net/tcp.h b/include/net/tcp.h index 3fc77e90624..6f87f087384 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -1308,7 +1308,8 @@ struct tcp_fastopen_request { /* Fast Open cookie. Size 0 means a cookie request */ struct tcp_fastopen_cookie cookie; struct msghdr *data; /* data in MSG_FASTOPEN */ - u16 copied; /* queued in tcp_connect() */ + size_t size; + int copied; /* queued in tcp_connect() */ }; void tcp_free_fastopen_req(struct tcp_sock *tp); diff --git a/include/target/iscsi/iscsi_transport.h b/include/target/iscsi/iscsi_transport.h index c5aade52386..4a5f00e2e6c 100644 --- a/include/target/iscsi/iscsi_transport.h +++ b/include/target/iscsi/iscsi_transport.h @@ -11,6 +11,7 @@ struct iscsit_transport { int (*iscsit_setup_np)(struct iscsi_np *, struct __kernel_sockaddr_storage *); int (*iscsit_accept_np)(struct iscsi_np *, struct iscsi_conn *); void (*iscsit_free_np)(struct iscsi_np *); + void (*iscsit_wait_conn)(struct iscsi_conn *); void (*iscsit_free_conn)(struct iscsi_conn *); struct iscsi_cmd *(*iscsit_alloc_cmd)(struct iscsi_conn *, gfp_t); int (*iscsit_get_login_rx)(struct iscsi_conn *, struct iscsi_login *); |