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
This commit is contained in:
Linus Torvalds 2008-12-05 13:42:08 -08:00
commit 24920a79a2
1 changed files with 1 additions and 1 deletions
arch/mips/kernel

View File

@ -1134,7 +1134,7 @@ static int vpe_release(struct inode *inode, struct file *filp)
/* It's good to be able to run the SP and if it chokes have a look at /* It's good to be able to run the SP and if it chokes have a look at
the /dev/rt?. But if we reset the pointer to the shared struct we the /dev/rt?. But if we reset the pointer to the shared struct we
loose what has happened. So perhaps if garbage is sent to the vpe lose what has happened. So perhaps if garbage is sent to the vpe
device, use it as a trigger for the reset. Hopefully a nice device, use it as a trigger for the reset. Hopefully a nice
executable will be along shortly. */ executable will be along shortly. */
if (ret < 0) if (ret < 0)