diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 21:53:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-24 21:53:45 +0200 |
| commit | 7c0a57d5c47bcfc492b3139e77400f888a935c44 (patch) | |
| tree | 1495a9238c7ee207d384737d3b777c0e21b75771 /drivers | |
| parent | mm: fix hugetlb bug due to user_shm_unlock call (diff) | |
| parent | [ARM] Orion NAND: Make asm volatile avoid GCC pushing ldrd out of the loop (diff) | |
| download | linux-7c0a57d5c47bcfc492b3139e77400f888a935c44.tar.xz linux-7c0a57d5c47bcfc492b3139e77400f888a935c44.zip | |
Merge branch 'fixes' of git://git.marvell.com/orion
* 'fixes' of git://git.marvell.com/orion:
[ARM] Orion NAND: Make asm volatile avoid GCC pushing ldrd out of the loop
[ARM] Kirkwood: enable eSATA on QNAP TS-219P
[ARM] Kirkwood: __init requires linux/init.h
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nand/orion_nand.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index 7ad972229db4..0d9d4bc9c762 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c @@ -61,7 +61,7 @@ static void orion_nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) buf64 = (uint64_t *)buf; while (i < len/8) { uint64_t x; - asm ("ldrd\t%0, [%1]" : "=r" (x) : "r" (io_base)); + asm volatile ("ldrd\t%0, [%1]" : "=&r" (x) : "r" (io_base)); buf64[i++] = x; } i *= 8; |