diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-08-30 12:30:09 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-30 12:30:09 -0400 |
| commit | 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch) | |
| tree | eab3d229c7a527816db405299ce9603e538b521f /arch/sparc64/kernel/sbus.c | |
| parent | e438befd76a5a743725a89365140a8a7bf276096 (diff) | |
| parent | d8971fcb702e24d1e22c77fd1772f182ffee87e3 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/sparc64/kernel/sbus.c')
| -rw-r--r-- | arch/sparc64/kernel/sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 89f5e019f24c..e09ddf927655 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c | |||
| @@ -147,7 +147,7 @@ static void sbus_strbuf_flush(struct sbus_iommu *iommu, u32 base, unsigned long | |||
| 147 | if (!limit) | 147 | if (!limit) |
| 148 | break; | 148 | break; |
| 149 | udelay(1); | 149 | udelay(1); |
| 150 | membar("#LoadLoad"); | 150 | rmb(); |
| 151 | } | 151 | } |
| 152 | if (!limit) | 152 | if (!limit) |
| 153 | printk(KERN_WARNING "sbus_strbuf_flush: flushflag timeout " | 153 | printk(KERN_WARNING "sbus_strbuf_flush: flushflag timeout " |