diff options
| author | Sandeep Patil <sspatil@google.com> | 2018-05-22 10:03:56 -0700 |
|---|---|---|
| committer | Sandeep Patil <sspatil@google.com> | 2018-05-22 10:03:56 -0700 |
| commit | b76b0da14f36098066745f661c106e42f8b6ad8c (patch) | |
| tree | 5b323bbdef8316fcd776bf0f50e8c69316e31ce8 /include | |
| parent | 01f3b4865dfb3dd7b9d63554236b89ce11864122 (diff) | |
| parent | 2b59cb7780741118b58dba7caa169fcf754038bc (diff) | |
Merge remote-tracking branch 'common/android-4.14'
Signed-off-by: Sandeep Patil <sspatil@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 1 | ||||
| -rw-r--r-- | include/net/bonding.h | 1 | ||||
| -rw-r--r-- | include/net/tls.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 4ea833660215..eddd78b77986 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2385,6 +2385,7 @@ static inline struct page *follow_page(struct vm_area_struct *vma, #define FOLL_MLOCK 0x1000 /* lock present pages */ #define FOLL_REMOTE 0x2000 /* we are working on non-current tsk/mm */ #define FOLL_COW 0x4000 /* internal GUP flag */ +#define FOLL_ANON 0x8000 /* don't do file mappings */ static inline int vm_fault_to_errno(int vm_fault, int foll_flags) { diff --git a/include/net/bonding.h b/include/net/bonding.h index b2e68657a216..73799da57400 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h @@ -198,6 +198,7 @@ struct bonding { struct slave __rcu *primary_slave; struct bond_up_slave __rcu *slave_arr; /* Array of usable slaves */ bool force_primary; + u32 nest_level; s32 slave_cnt; /* never change this value outside the attach/detach wrappers */ int (*recv_probe)(const struct sk_buff *, struct bonding *, struct slave *); diff --git a/include/net/tls.h b/include/net/tls.h index df950383b8c1..48940a883d9a 100644 --- a/include/net/tls.h +++ b/include/net/tls.h @@ -98,6 +98,7 @@ struct tls_context { struct scatterlist *partially_sent_record; u16 partially_sent_offset; unsigned long flags; + bool in_tcp_sendpages; u16 pending_open_record_frags; int (*push_pending_record)(struct sock *sk, int flags); |