git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ieee1394: silence defined but not used warning in non-modular builds
[sfrench/cifs-2.6.git]
/
arch
/
sparc64
/
solaris
/
misc.c
diff --git
a/arch/sparc64/solaris/misc.c
b/arch/sparc64/solaris/misc.c
index 542c808ec2c83c7b411982610f6e793358105de5..d3e48e9701bf33b35047cda9ebda3eb9e5546316 100644
(file)
--- a/
arch/sparc64/solaris/misc.c
+++ b/
arch/sparc64/solaris/misc.c
@@
-6,7
+6,6
@@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/types.h>
-#include <linux/smp_lock.h>
#include <linux/utsname.h>
#include <linux/limits.h>
#include <linux/mm.h>
#include <linux/utsname.h>
#include <linux/limits.h>
#include <linux/mm.h>
@@
-416,7
+415,7
@@
asmlinkage int solaris_procids(int cmd, s32 pid, s32 pgid)
switch (cmd) {
case 0: /* getpgrp */
switch (cmd) {
case 0: /* getpgrp */
- return
process_group
(current);
+ return
task_pgrp_vnr
(current);
case 1: /* setpgrp */
{
int (*sys_setpgid)(pid_t,pid_t) =
case 1: /* setpgrp */
{
int (*sys_setpgid)(pid_t,pid_t) =
@@
-427,7
+426,7
@@
asmlinkage int solaris_procids(int cmd, s32 pid, s32 pgid)
ret = sys_setpgid(0, 0);
if (ret) return ret;
proc_clear_tty(current);
ret = sys_setpgid(0, 0);
if (ret) return ret;
proc_clear_tty(current);
- return
process_group
(current);
+ return
task_pgrp_vnr
(current);
}
case 2: /* getsid */
{
}
case 2: /* getsid */
{