Commit a52e8381 authored by Linus Torvalds's avatar Linus Torvalds

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

parents be9d1227 da160546
...@@ -109,7 +109,7 @@ static void bad_kernel_pc(struct pt_regs *regs) ...@@ -109,7 +109,7 @@ static void bad_kernel_pc(struct pt_regs *regs)
* this. Additionally, to prevent kswapd from ripping ptes from * this. Additionally, to prevent kswapd from ripping ptes from
* under us, raise interrupts around the time that we look at the * 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 * 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) static unsigned int get_user_insn(unsigned long tpc)
{ {
......
...@@ -596,6 +596,8 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd, ...@@ -596,6 +596,8 @@ static long openprom_compat_ioctl(struct file *file, unsigned int cmd,
lock_kernel(); lock_kernel();
break; break;
} }
return rval;
} }
static int openprom_open(struct inode * inode, struct file * file) static int openprom_open(struct inode * inode, struct file * file)
...@@ -623,6 +625,7 @@ static struct file_operations openprom_fops = { ...@@ -623,6 +625,7 @@ static struct file_operations openprom_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.ioctl = openprom_ioctl, .ioctl = openprom_ioctl,
.compat_ioctl = openprom_compat_ioctl,
.open = openprom_open, .open = openprom_open,
.release = openprom_release, .release = openprom_release,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment