From 9a6536521110b2a8e97a9714bd67608d405ef175 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Tue, 25 Dec 2012 20:29:43 -0500 Subject: [PATCH] --- yaml --- r: 356753 b: refs/heads/master c: 25f9e5c4e07f6107b81babe7ad71b90b329d587b h: refs/heads/master i: 356751: 7e1c46d2cef06cb18f666f3c2d6e8d8056dc23c0 v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/sys32.S | 2 +- trunk/arch/sparc/kernel/sys_sparc32.c | 10 ---------- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 25380b2672ae..a825f3a05d54 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a274bd498ce4b57294034d428b801b2bca3af774 +refs/heads/master: 25f9e5c4e07f6107b81babe7ad71b90b329d587b diff --git a/trunk/arch/sparc/kernel/sys32.S b/trunk/arch/sparc/kernel/sys32.S index 9d2e99658aff..9265a612d4ba 100644 --- a/trunk/arch/sparc/kernel/sys32.S +++ b/trunk/arch/sparc/kernel/sys32.S @@ -101,7 +101,7 @@ SIGN1(sys32_getsid, sys_getsid, %o0) SIGN2(sys32_kill, sys_kill, %o0, %o1) SIGN1(sys32_nice, sys_nice, %o0) SIGN1(sys32_lseek, sys_lseek, %o1) -SIGN2(sys32_open, sparc32_open, %o1, %o2) +SIGN2(sys32_open, compat_sys_open, %o1, %o2) SIGN1(sys32_readlink, sys_readlink, %o2) SIGN1(sys32_sched_get_priority_max, sys_sched_get_priority_max, %o0) SIGN1(sys32_sched_get_priority_min, sys_sched_get_priority_min, %o0) diff --git a/trunk/arch/sparc/kernel/sys_sparc32.c b/trunk/arch/sparc/kernel/sys_sparc32.c index dcce0a6216cf..a492380331e6 100644 --- a/trunk/arch/sparc/kernel/sys_sparc32.c +++ b/trunk/arch/sparc/kernel/sys_sparc32.c @@ -337,16 +337,6 @@ long compat_sys_fadvise64_64(int fd, advice); } -/* This is just a version for 32-bit applications which does - * not force O_LARGEFILE on. - */ - -asmlinkage long sparc32_open(const char __user *filename, - int flags, int mode) -{ - return do_sys_open(AT_FDCWD, filename, flags, mode); -} - long sys32_lookup_dcookie(unsigned long cookie_high, unsigned long cookie_low, char __user *buf, size_t len)