diff options
| author |   Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-04-08 09:18:00 -0700 |
| commit | 19e831b272e6db5884be085be66e44da975c73a9 (patch) | |
| tree | 8812543bc66dc531e4720f5119107e7de3447a46 /include/uapi/linux | |
| parent | ARM: dts: am335x-baltos-ir5221: fix cpsw_emac0 link type (diff) | |
| parent | ARM: OMAP: Catch callers of revision information prior to it being populated (diff) | |
Merge branch 'fixes-rc2' into omap-for-v4.6/fixes
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/bpf.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/stddef.h | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 924f537183fd..23917bb47bf3 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -375,6 +375,7 @@ struct bpf_tunnel_key { }; __u8 tunnel_tos; __u8 tunnel_ttl; + __u16 tunnel_ext; __u32 tunnel_label; }; diff --git a/include/uapi/linux/stddef.h b/include/uapi/linux/stddef.h index aa9f10428743..621fa8ac4425 100644 --- a/include/uapi/linux/stddef.h +++ b/include/uapi/linux/stddef.h @@ -1 +1,5 @@ #include <linux/compiler.h> + +#ifndef __always_inline +#define __always_inline inline +#endif |