diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-07-12 03:29:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-07-12 03:29:33 -0700 |
| commit | 7438a89b3c3590ae2a4f57035d5aae8a65b75e93 (patch) | |
| tree | a8748a983a6a40b316fce007374ce2879d527d86 /include | |
| parent | d03efe4d51a0f3911b685d377998a817c323ff01 (diff) | |
| parent | 4c8daae4af3f2a10d60daecf91604e2ace98dda1 (diff) | |
Merge "Merge android-4.4@64a73ff (v4.4.76) into msm-4.4"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/coredump.h | 1 | ||||
| -rw-r--r-- | include/net/xfrm.h | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/include/linux/coredump.h b/include/linux/coredump.h index d016a121a8c4..28ffa94aed6b 100644 --- a/include/linux/coredump.h +++ b/include/linux/coredump.h @@ -14,6 +14,7 @@ struct coredump_params; extern int dump_skip(struct coredump_params *cprm, size_t nr); extern int dump_emit(struct coredump_params *cprm, const void *addr, int nr); extern int dump_align(struct coredump_params *cprm, int align); +extern void dump_truncate(struct coredump_params *cprm); #ifdef CONFIG_COREDUMP extern void do_coredump(const siginfo_t *siginfo); #else diff --git a/include/net/xfrm.h b/include/net/xfrm.h index d18cbafc3455..c81d806e415f 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -947,10 +947,6 @@ struct xfrm_dst { struct flow_cache_object flo; struct xfrm_policy *pols[XFRM_POLICY_TYPE_MAX]; int num_pols, num_xfrms; -#ifdef CONFIG_XFRM_SUB_POLICY - struct flowi *origin; - struct xfrm_selector *partner; -#endif u32 xfrm_genid; u32 policy_genid; u32 route_mtu_cached; @@ -966,12 +962,6 @@ static inline void xfrm_dst_destroy(struct xfrm_dst *xdst) dst_release(xdst->route); if (likely(xdst->u.dst.xfrm)) xfrm_state_put(xdst->u.dst.xfrm); -#ifdef CONFIG_XFRM_SUB_POLICY - kfree(xdst->origin); - xdst->origin = NULL; - kfree(xdst->partner); - xdst->partner = NULL; -#endif } #endif |