diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-12 20:44:53 -0400 |
| commit | aa11d958d1a6572eda08214d7c6a735804fe48a5 (patch) | |
| tree | d025b05270ad1e010660d17eeadc6ac3c1abbd7d /arch/powerpc/include/asm/delay.h | |
| parent | 07f6642ee9418e962e54cbc07471cfe2e559c568 (diff) | |
| parent | 9799218ae36910af50f002a5db1802d576fffb43 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
arch/microblaze/include/asm/socket.h
Diffstat (limited to 'arch/powerpc/include/asm/delay.h')
| -rw-r--r-- | arch/powerpc/include/asm/delay.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/delay.h b/arch/powerpc/include/asm/delay.h index 1e2eb41fa057..52e4d54da2a9 100644 --- a/arch/powerpc/include/asm/delay.h +++ b/arch/powerpc/include/asm/delay.h | |||
| @@ -63,6 +63,8 @@ extern void udelay(unsigned long usecs); | |||
| 63 | udelay(delay); \ | 63 | udelay(delay); \ |
| 64 | else \ | 64 | else \ |
| 65 | cpu_relax(); \ | 65 | cpu_relax(); \ |
| 66 | if (!__ret) \ | ||
| 67 | __ret = (condition); \ | ||
| 66 | __ret; \ | 68 | __ret; \ |
| 67 | }) | 69 | }) |
| 68 | 70 | ||