diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 16:23:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-27 16:23:12 -0700 |
| commit | 3ae5080f4c2e293229508dabe7c8a90af4e4c460 (patch) | |
| tree | 9cb11f26905a82b7fac9d3b8f9d61d58bc5c94b0 /arch/alpha | |
| parent | 2c9e15a011c55ff96b2b8d2b126d1b9a96abba20 (diff) | |
| parent | aabb8fdb41128705fd1627f56fdd571e45fdbcdb (diff) | |
| download | op-kernel-dev-3ae5080f4c2e293229508dabe7c8a90af4e4c460.zip op-kernel-dev-3ae5080f4c2e293229508dabe7c8a90af4e4c460.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (37 commits)
fs: avoid I_NEW inodes
Merge code for single and multiple-instance mounts
Remove get_init_pts_sb()
Move common mknod_ptmx() calls into caller
Parse mount options just once and copy them to super block
Unroll essentials of do_remount_sb() into devpts
vfs: simple_set_mnt() should return void
fs: move bdev code out of buffer.c
constify dentry_operations: rest
constify dentry_operations: configfs
constify dentry_operations: sysfs
constify dentry_operations: JFS
constify dentry_operations: OCFS2
constify dentry_operations: GFS2
constify dentry_operations: FAT
constify dentry_operations: FUSE
constify dentry_operations: procfs
constify dentry_operations: ecryptfs
constify dentry_operations: CIFS
constify dentry_operations: AFS
...
Diffstat (limited to 'arch/alpha')
| -rw-r--r-- | arch/alpha/kernel/entry.S | 3 | ||||
| -rw-r--r-- | arch/alpha/kernel/osf_sys.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index e4a54b615..b45d913 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S @@ -903,8 +903,9 @@ sys_alpha_pipe: stq $26, 0($sp) .prologue 0 + mov $31, $17 lda $16, 8($sp) - jsr $26, do_pipe + jsr $26, do_pipe_flags ldq $26, 0($sp) bne $0, 1f diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index ae41f09..42ee059 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -46,8 +46,6 @@ #include <asm/hwrpb.h> #include <asm/processor.h> -extern int do_pipe(int *); - /* * Brk needs to return an error. Still support Linux's brk(0) query idiom, * which OSF programs just shouldn't be doing. We're still not quite |
