diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:31:37 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-01-14 22:31:37 +0800 |
| commit | fef6c6c09f13ef1f58fd841a08da53c6a8651bdf (patch) | |
| tree | be9c6b6f79e17be67ad3b91c0ff9d78ab8759910 /include/linux | |
| parent | 9fc740e49155dd8d77a7a51f8657825e9aa29826 (diff) | |
| parent | 039b7fca24dba50c09e60b23494ba3c4d19aac7d (diff) | |
Merge branch 'linux-linaro-lsk-v4.1' into linux-linaro-lsk-v4.1-android
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/ipv6.h | 2 | ||||
| -rw-r--r-- | include/linux/jbd2.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h index 2343532439ee..ecd1e9c9a7c6 100644 --- a/include/linux/ipv6.h +++ b/include/linux/ipv6.h @@ -226,7 +226,7 @@ struct ipv6_pinfo { struct ipv6_ac_socklist *ipv6_ac_list; struct ipv6_fl_socklist __rcu *ipv6_fl_list; - struct ipv6_txoptions *opt; + struct ipv6_txoptions __rcu *opt; struct sk_buff *pktoptions; struct sk_buff *rxpmtu; struct inet6_cork cork; diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index eb1cebed3f36..c90c9b70e568 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1007,6 +1007,7 @@ struct journal_s #define JBD2_ABORT_ON_SYNCDATA_ERR 0x040 /* Abort the journal on file * data write error in ordered * mode */ +#define JBD2_REC_ERR 0x080 /* The errno in the sb has been recorded */ /* * Function declarations for the journaling transaction and buffer |