diff options
| author | Helge Deller <deller@gmx.de> | 2013-02-20 21:35:36 (GMT) |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2013-02-20 21:35:36 (GMT) |
| commit | 26ad19d8ebdb73869341b1b4159d32c0f0755946 (patch) | |
| tree | 7861bb4df8b452ad5f71c8818d5f814f483f2150 /arch/parisc/hpux/fs.c | |
| parent | 19f949f52599ba7c3f67a5897ac6be14bfcb1200 (diff) | |
| parent | 6c700d71f7faecb540b3fa4303edb5323a2768c1 (diff) | |
| download | linux-26ad19d8ebdb73869341b1b4159d32c0f0755946.tar.xz | |
Merge tag 'parisc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6 into stable-3.8
PARISC fixes on 20130213
This is a couple of patches, one to fix a broken build with HPUX compatibility
and the other to solve a coherency problem we've been seeing in our TLB where
setting a page read only occasionally fails to trigger a COW because of a
stale writeable TLB entry.
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'arch/parisc/hpux/fs.c')
| -rw-r--r-- | arch/parisc/hpux/fs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/parisc/hpux/fs.c b/arch/parisc/hpux/fs.c index a0760b8..838b479 100644 --- a/arch/parisc/hpux/fs.c +++ b/arch/parisc/hpux/fs.c @@ -43,8 +43,7 @@ int hpux_execve(struct pt_regs *regs) error = do_execve(filename->name, (const char __user *const __user *) regs->gr[25], - (const char __user *const __user *) regs->gr[24], - regs); + (const char __user *const __user *) regs->gr[24]); putname(filename); |