diff options
| author | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-06-03 09:31:58 -0400 |
| commit | 9c54aeb03a6d65a5834bd92376e921cbac6dfb8f (patch) | |
| tree | 70441095d58678711d68cfef4934765251425d1f /arch/s390 | |
| parent | eaf47b17a77fda841a1102d76c15161ee438b347 (diff) | |
| parent | 918fe1b3157978ada4267468008c5f89ef101e7d (diff) | |
| download | op-kernel-dev-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.zip op-kernel-dev-9c54aeb03a6d65a5834bd92376e921cbac6dfb8f.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Filling in the padding slot in the bpf structure as a bug fix in 'ne'
overlapped with actually using that padding area for something in
'net-next'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kvm/vsie.c | 2 | ||||
| -rw-r--r-- | arch/s390/purgatory/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 8961e39..969882b 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -578,7 +578,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) gpa = READ_ONCE(scb_o->itdba) & ~0xffUL; if (gpa && (scb_s->ecb & ECB_TE)) { - if (!(gpa & ~0x1fffU)) { + if (!(gpa & ~0x1fffUL)) { rc = set_validity_icpt(scb_s, 0x0080U); goto unpin; } diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile index e9525bc..1ace023 100644 --- a/arch/s390/purgatory/Makefile +++ b/arch/s390/purgatory/Makefile @@ -21,7 +21,7 @@ LDFLAGS_purgatory.ro += -z nodefaultlib KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding -KBUILD_CFLAGS += -c -MD -Os -m64 +KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float KBUILD_CFLAGS += $(call cc-option,-fno-PIE) $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE |
