Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

git-mirror · Nov 8, 2005 · a52e838 · a52e838
2 parents be9d122 + da16054
commit a52e838
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c
@@ -109,7 +109,7 @@ static void bad_kernel_pc(struct pt_regs *regs)
  * this. Additionally, to prevent kswapd from ripping ptes from
  * under us, raise interrupts around the time that we look at the
  * pte, kswapd will have to wait to get his smp ipi response from
- * us. This saves us having to get page_table_lock.
+ * us. vmtruncate likewise. This saves us having to get pte lock.
  */
 static unsigned int get_user_insn(unsigned long tpc)
 {

diff --git a/drivers/sbus/char/openprom.c b/drivers/sbus/char/openprom.c
@@ -596,6 +596,8 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
 		lock_kernel();
 		break;
 	}
+
+	return rval;
 }
 
 static int openprom_open(struct inode * inode, struct file * file)
@@ -623,6 +625,7 @@ static struct file_operations openprom_fops = {
 	.owner =	THIS_MODULE,
 	.llseek =	no_llseek,
 	.ioctl =	openprom_ioctl,
+	.compat_ioctl =	openprom_compat_ioctl,
 	.open =		openprom_open,
 	.release =	openprom_release,
 };