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 's390-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[sfrench/cifs-2.6.git]
/
arch
/
s390
/
kernel
/
ipl.c
diff --git
a/arch/s390/kernel/ipl.c
b/arch/s390/kernel/ipl.c
index 98b3aca1de8e1daaef0aa5a99a2f35c5e3cd822d..7a21eca498aae762ee26be052078689639325b49 100644
(file)
--- a/
arch/s390/kernel/ipl.c
+++ b/
arch/s390/kernel/ipl.c
@@
-1512,7
+1512,7
@@
static void diag308_dump(void *dump_block)
while (1) {
if (diag308(DIAG308_LOAD_NORMAL_DUMP, NULL) != 0x302)
break;
- udelay
_simple
(USEC_PER_SEC);
+ udelay(USEC_PER_SEC);
}
}