aboutsummaryrefslogtreecommitdiff
path: root/arch/s390/net/bpf_jit.h
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2016-06-27 12:18:01 +0800
committerAlex Shi <alex.shi@linaro.org>2016-06-27 12:18:01 +0800
commitffc4aa8f521606f63f59ff708f49780172909e94 (patch)
tree274944bdc4c317e54faa95636c9f1771d8d51b43 /arch/s390/net/bpf_jit.h
parent46b4dd0c2535cbb70766f74bb9228ed81f59054d (diff)
parent9ca1d50fa959cda1f04f43275f7930a70f1a631e (diff)
Merge tag 'v4.4.14' into linux-linaro-lsk-v4.4lsk-v4.4-16.06
This is the 4.4.14 stable release
Diffstat (limited to 'arch/s390/net/bpf_jit.h')
-rw-r--r--arch/s390/net/bpf_jit.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/net/bpf_jit.h b/arch/s390/net/bpf_jit.h
index f010c93a88b1..fda605dbc1b4 100644
--- a/arch/s390/net/bpf_jit.h
+++ b/arch/s390/net/bpf_jit.h
@@ -37,7 +37,7 @@ extern u8 sk_load_word[], sk_load_half[], sk_load_byte[];
* | | |
* +---------------+ |
* | 8 byte skbp | |
- * R15+170 -> +---------------+ |
+ * R15+176 -> +---------------+ |
* | 8 byte hlen | |
* R15+168 -> +---------------+ |
* | 4 byte align | |
@@ -58,7 +58,7 @@ extern u8 sk_load_word[], sk_load_half[], sk_load_byte[];
#define STK_OFF (STK_SPACE - STK_160_UNUSED)
#define STK_OFF_TMP 160 /* Offset of tmp buffer on stack */
#define STK_OFF_HLEN 168 /* Offset of SKB header length on stack */
-#define STK_OFF_SKBP 170 /* Offset of SKB pointer on stack */
+#define STK_OFF_SKBP 176 /* Offset of SKB pointer on stack */
#define STK_OFF_R6 (160 - 11 * 8) /* Offset of r6 on stack */
#define STK_OFF_TCCNT (160 - 12 * 8) /* Offset of tail_call_cnt on stack */