diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 02:46:01 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-09-03 02:46:01 +0200 |
| commit | 0ed537b5fd18c38b526fd0e6837a00f96aee30c4 (patch) | |
| tree | 01744d89b09aaaaad77696265fb4732ef9a8fc32 /arch/s390/net/bpf_jit_comp.c | |
| parent | 72e624de6e6f0d5a638fbc23842aa76ae048e9e7 (diff) | |
| parent | 50a3cb04a5f9cd5323a76db9ee409a7f3004259a (diff) | |
| download | talos-op-linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.tar.gz talos-op-linux-0ed537b5fd18c38b526fd0e6837a00f96aee30c4.zip | |
Merge branch 'pm-opp' into pm-cpufreq
Diffstat (limited to 'arch/s390/net/bpf_jit_comp.c')
| -rw-r--r-- | arch/s390/net/bpf_jit_comp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c index fee782acc2ee..8d2e5165865f 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c @@ -448,13 +448,13 @@ static void bpf_jit_prologue(struct bpf_jit *jit) EMIT6_DISP_LH(0xe3000000, 0x0004, REG_SKB_DATA, REG_0, BPF_REG_1, offsetof(struct sk_buff, data)); } - /* BPF compatibility: clear A (%b7) and X (%b8) registers */ - if (REG_SEEN(BPF_REG_7)) - /* lghi %b7,0 */ - EMIT4_IMM(0xa7090000, BPF_REG_7, 0); - if (REG_SEEN(BPF_REG_8)) - /* lghi %b8,0 */ - EMIT4_IMM(0xa7090000, BPF_REG_8, 0); + /* BPF compatibility: clear A (%b0) and X (%b7) registers */ + if (REG_SEEN(BPF_REG_A)) + /* lghi %ba,0 */ + EMIT4_IMM(0xa7090000, BPF_REG_A, 0); + if (REG_SEEN(BPF_REG_X)) + /* lghi %bx,0 */ + EMIT4_IMM(0xa7090000, BPF_REG_X, 0); } /* |
