git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'xfs-for-linus-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
include
/
asm
/
diag.h
diff --git
a/arch/s390/include/asm/diag.h
b/arch/s390/include/asm/diag.h
index 5fac921c1c4210c66b8cb3f3a6b4ca4f4bf71ed9..86cae09e076af3048fda8045c05779233e264617 100644
(file)
--- a/
arch/s390/include/asm/diag.h
+++ b/
arch/s390/include/asm/diag.h
@@
-49,7
+49,7
@@
static inline void diag10_range(unsigned long start_pfn, unsigned long num_pfn)
diag_stat_inc(DIAG_STAT_X010);
asm volatile(
"0: diag %0,%1,0x10\n"
- "1:\n"
+ "1:
nopr %%r7
\n"
EX_TABLE(0b, 1b)
EX_TABLE(1b, 1b)
: : "a" (start_addr), "a" (end_addr));