git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6
[pandora-kernel.git]
/
arch
/
s390
/
mm
/
maccess.c
diff --git
a/arch/s390/mm/maccess.c
b/arch/s390/mm/maccess.c
index
a8c2af8
..
71a4b0d
100644
(file)
--- a/
arch/s390/mm/maccess.c
+++ b/
arch/s390/mm/maccess.c
@@
-71,7
+71,7
@@
int memcpy_real(void *dest, void *src, size_t count)
if (!count)
return 0;
if (!count)
return 0;
- flags = __
raw
_local_irq_stnsm(0xf8UL);
+ flags = __
arch
_local_irq_stnsm(0xf8UL);
asm volatile (
"0: mvcle %1,%2,0x0\n"
"1: jo 0b\n"
asm volatile (
"0: mvcle %1,%2,0x0\n"
"1: jo 0b\n"
@@
-82,6
+82,6
@@
int memcpy_real(void *dest, void *src, size_t count)
"+d" (_len2), "=m" (*((long *) dest))
: "m" (*((long *) src))
: "cc", "memory");
"+d" (_len2), "=m" (*((long *) dest))
: "m" (*((long *) src))
: "cc", "memory");
-
__raw_local_irq_ssm
(flags);
+
arch_local_irq_restore
(flags);
return rc;
}
return rc;
}