diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 16:42:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-05 16:42:08 -0500 |
commit | 24920a79a27dd28e67088bbfcf36746d15587f4d (patch) | |
tree | 2915c6ab589ba8ec639c2f80d21086d3d5c20400 | |
parent | 2289e6643660601d3b21a22effd04dcca27775e4 (diff) | |
parent | 8ebcfc8bcb55261cf01fc302d707fbba46242bf1 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
MIPS: Fix incorrect use of loose in vpe.c
-rw-r--r-- | arch/mips/kernel/vpe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 972b2d2b8401..a1b3da6bad5c 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c | |||
@@ -1134,7 +1134,7 @@ static int vpe_release(struct inode *inode, struct file *filp) | |||
1134 | 1134 | ||
1135 | /* It's good to be able to run the SP and if it chokes have a look at | 1135 | /* It's good to be able to run the SP and if it chokes have a look at |
1136 | the /dev/rt?. But if we reset the pointer to the shared struct we | 1136 | the /dev/rt?. But if we reset the pointer to the shared struct we |
1137 | loose what has happened. So perhaps if garbage is sent to the vpe | 1137 | lose what has happened. So perhaps if garbage is sent to the vpe |
1138 | device, use it as a trigger for the reset. Hopefully a nice | 1138 | device, use it as a trigger for the reset. Hopefully a nice |
1139 | executable will be along shortly. */ | 1139 | executable will be along shortly. */ |
1140 | if (ret < 0) | 1140 | if (ret < 0) |