diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 10:23:00 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 10:23:00 -0800 |
| commit | a52e8381c430896d3bd6065a34fda99cb5c74c82 (patch) | |
| tree | 549c65dab5e5b2a0358ff45a3bcd37f2e37ffec4 | |
| parent | be9d122730c878baafe11e70d1436faac229f2fc (diff) | |
| parent | da1605465ebdb9dc25296a354394086cd559c243 (diff) | |
| download | kernel_samsung_crespo-a52e8381c430896d3bd6065a34fda99cb5c74c82.zip kernel_samsung_crespo-a52e8381c430896d3bd6065a34fda99cb5c74c82.tar.gz kernel_samsung_crespo-a52e8381c430896d3bd6065a34fda99cb5c74c82.tar.bz2 | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | arch/sparc64/mm/fault.c | 2 | ||||
| -rw-r--r-- | drivers/sbus/char/openprom.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c index 31fbc67..3be278d 100644 --- 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 index 5028ac2..383a95f 100644 --- 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, }; |