eta name='generator' content='cgit v1.2.3-54-g00ecf'/>
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Wu <tung7970@gmail.com>2015-12-04 19:40:00 +0800
committerRalf Baechle <ralf@linux-mips.org>2016-05-13 23:04:53 +0200
commit0868971a8dad52e726711a2a4b161ace9ed011fa (patch)
tree737e071bfc28af9b7654e2b4d91866754d5d128e
parent2afb97454347f641dd2435a3956ba12f816fb1df (diff)
MIPS: CM: Fix compilation error when !MIPS_CM
Fix mips_cm_lock_other compilation error when MIPS_CM is not selected. This was introduced in commit 23d5de8efb9a (MIPS: CM: Introduce core-other locking functions) Signed-off-by: Tony Wu <tung7970@gmail.com> Cc: Paul Burton <paul.burton@imgtec.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/11698/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
ve&id=9a7382662fc85b29f2b0dc4e7c61896cbd06593d&id2=e40d5d78df539c0c9b6625cdf5b1bc4b14c4d8bf'>diff)
tools: Sync {,tools/}include/uapi/linux/bpf.h
The tools version of this header is out of date; update it to the latest version from kernel header. Synchronize with the following commits: * b95a5c4db09b ("bpf: add a longest prefix match trie map implementation") * a5e8c07059d0 ("bpf: add bpf_probe_read_str helper") * d1b662adcdb8 ("bpf: allow option for setting bpf_l4_csum_replace from scratch") Signed-off-by: Mickaël Salaün <mic@digikod.net> Cc: Alexei Starovoitov <ast@fb.com> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Daniel Mack <daniel@zonque.org> Cc: David S. Miller <davem@davemloft.net> Cc: Gianluca Borello <g.borello@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
-rw-r--r--tools/include/uapi/linux/bpf.h23
1 files changed, 22 insertions, 1 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h