Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"Two late bug fixes for kernel 4.4.
Merry Christmas"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/dis: Fix handling of format specifiers
s390/zcrypt: Fix AP queue handling if queue is full
+15
-6
+12
-5
arch/s390/kernel/dis.c
+12
-5
arch/s390/kernel/dis.c
···
1920
1920
}
1921
1921
if (separator)
1922
1922
ptr += sprintf(ptr, "%c", separator);
1923
+
/*
1924
+
* Use four '%' characters below because of the
1925
+
* following two conversions:
1926
+
*
1927
+
* 1) sprintf: %%%%r -> %%r
1928
+
* 2) printk : %%r -> %r
1929
+
*/
1923
1930
if (operand->flags & OPERAND_GPR)
1924
-
ptr += sprintf(ptr, "%%r%i", value);
1931
+
ptr += sprintf(ptr, "%%%%r%i", value);
1925
1932
else if (operand->flags & OPERAND_FPR)
1926
-
ptr += sprintf(ptr, "%%f%i", value);
1933
+
ptr += sprintf(ptr, "%%%%f%i", value);
1927
1934
else if (operand->flags & OPERAND_AR)
1928
-
ptr += sprintf(ptr, "%%a%i", value);
1935
+
ptr += sprintf(ptr, "%%%%a%i", value);
1929
1936
else if (operand->flags & OPERAND_CR)
1930
-
ptr += sprintf(ptr, "%%c%i", value);
1937
+
ptr += sprintf(ptr, "%%%%c%i", value);
1931
1938
else if (operand->flags & OPERAND_VR)
1932
-
ptr += sprintf(ptr, "%%v%i", value);
1939
+
ptr += sprintf(ptr, "%%%%v%i", value);
1933
1940
else if (operand->flags & OPERAND_PCREL)
1934
1941
ptr += sprintf(ptr, "%lx", (signed int) value
1935
1942
+ addr);
+3
-1
drivers/s390/crypto/ap_bus.c
+3
-1
drivers/s390/crypto/ap_bus.c
···
599
599
status = ap_sm_recv(ap_dev);
600
600
switch (status.response_code) {
601
601
case AP_RESPONSE_NORMAL:
602
-
if (ap_dev->queue_count > 0)
602
+
if (ap_dev->queue_count > 0) {
603
+
ap_dev->state = AP_STATE_WORKING;
603
604
return AP_WAIT_AGAIN;
605
+
}
604
606
ap_dev->state = AP_STATE_IDLE;
605
607
return AP_WAIT_NONE;
606
608
case AP_RESPONSE_NO_PENDING_REPLY: