Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
cf3e3d83
Commit
cf3e3d83
authored
Mar 11, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
c830a071
b8394c1f
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
26 additions
and
49 deletions
+26
-49
arch/sparc64/kernel/sparc64_ksyms.c
arch/sparc64/kernel/sparc64_ksyms.c
+5
-0
arch/sparc64/kernel/sys_sparc32.c
arch/sparc64/kernel/sys_sparc32.c
+0
-35
arch/sparc64/kernel/systbls.S
arch/sparc64/kernel/systbls.S
+3
-3
arch/sparc64/kernel/us3_cpufreq.c
arch/sparc64/kernel/us3_cpufreq.c
+1
-1
include/asm-sparc64/compat.h
include/asm-sparc64/compat.h
+16
-0
include/asm-sparc64/fcntl.h
include/asm-sparc64/fcntl.h
+1
-10
No files found.
arch/sparc64/kernel/sparc64_ksyms.c
View file @
cf3e3d83
...
...
@@ -137,6 +137,11 @@ extern void mcount(void);
EXPORT_SYMBOL_NOVERS
(
mcount
);
#endif
/* Uniprocessor clock frequency */
#ifndef CONFIG_SMP
EXPORT_SYMBOL
(
up_clock_tick
);
#endif
/* Per-CPU information table */
EXPORT_SYMBOL
(
cpu_data
);
...
...
arch/sparc64/kernel/sys_sparc32.c
View file @
cf3e3d83
...
...
@@ -804,41 +804,6 @@ asmlinkage int sys32_ipc (u32 call, int first, int second, int third, u32 ptr, u
return
err
;
}
extern
asmlinkage
long
sys_fcntl
(
unsigned
int
fd
,
unsigned
int
cmd
,
unsigned
long
arg
);
asmlinkage
long
sys32_fcntl
(
unsigned
int
fd
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
switch
(
cmd
)
{
case
F_GETLK
:
case
F_SETLK
:
case
F_SETLKW
:
{
struct
flock
f
;
mm_segment_t
old_fs
;
long
ret
;
if
(
get_compat_flock
(
&
f
,
(
struct
compat_flock
*
)
arg
))
return
-
EFAULT
;
old_fs
=
get_fs
();
set_fs
(
KERNEL_DS
);
ret
=
sys_fcntl
(
fd
,
cmd
,
(
unsigned
long
)
&
f
);
set_fs
(
old_fs
);
if
(
ret
)
return
ret
;
if
(
put_compat_flock
(
&
f
,
(
struct
compat_flock
*
)
arg
))
return
-
EFAULT
;
return
0
;
}
default:
return
sys_fcntl
(
fd
,
cmd
,
(
unsigned
long
)
arg
);
}
}
asmlinkage
long
sys32_fcntl64
(
unsigned
int
fd
,
unsigned
int
cmd
,
unsigned
long
arg
)
{
if
(
cmd
>=
F_GETLK64
&&
cmd
<=
F_SETLKW64
)
return
sys_fcntl
(
fd
,
cmd
+
F_GETLK
-
F_GETLK64
,
arg
);
return
sys32_fcntl
(
fd
,
cmd
,
arg
);
}
extern
asmlinkage
long
sys_truncate
(
const
char
*
path
,
unsigned
long
length
);
extern
asmlinkage
long
sys_ftruncate
(
unsigned
int
fd
,
unsigned
long
length
);
...
...
arch/sparc64/kernel/systbls.S
View file @
cf3e3d83
...
...
@@ -37,7 +37,7 @@ sys_call_table32:
.
word
sys_madvise
,
sys_vhangup
,
sys32_truncate64
,
sys_mincore
,
sys32_getgroups16
/*
80
*/
.
word
sys32_setgroups16
,
sys_getpgrp
,
sys_setgroups
,
compat_sys_setitimer
,
sys32_ftruncate64
.
word
sys_swapon
,
compat_sys_getitimer
,
sys_setuid
,
sys_sethostname
,
sys_setgid
/*
90
*/
.
word
sys_dup2
,
sys_setfsuid
,
sys32
_fcntl
,
sys32_select
,
sys_setfsgid
/*
90
*/
.
word
sys_dup2
,
sys_setfsuid
,
compat_sys
_fcntl
,
sys32_select
,
sys_setfsgid
.
word
sys_fsync
,
sys_setpriority32
,
sys_nis_syscall
,
sys_nis_syscall
,
sys_nis_syscall
/*
100
*/
.
word
sys_getpriority
,
sys32_rt_sigreturn
,
sys32_rt_sigaction
,
sys32_rt_sigprocmask
,
sys32_rt_sigpending
.
word
sys32_rt_sigtimedwait
,
sys32_rt_sigqueueinfo
,
sys32_rt_sigsuspend
,
sys_setresuid
,
sys_getresuid
...
...
@@ -50,7 +50,7 @@ sys_call_table32:
/*
140
*/
.
word
sys32_sendfile64
,
sys_nis_syscall
,
compat_sys_futex
,
sys_gettid
,
sys32_getrlimit
.
word
sys32_setrlimit
,
sys_pivot_root
,
sys32_prctl
,
sys32_pciconfig_read
,
sys32_pciconfig_write
/*
150
*/
.
word
sys_nis_syscall
,
sys_nis_syscall
,
sys_nis_syscall
,
sys_poll
,
sys_getdents64
.
word
sys32
_fcntl64
,
sys_ni_syscall
,
compat_sys_statfs
,
compat_sys_fstatfs
,
sys_oldumount
.
word
compat_sys
_fcntl64
,
sys_ni_syscall
,
compat_sys_statfs
,
compat_sys_fstatfs
,
sys_oldumount
/*
160
*/
.
word
sys32_sched_setaffinity
,
sys32_sched_getaffinity
,
sys_getdomainname
,
sys_setdomainname
,
sys_nis_syscall
.
word
sys_quotactl
,
sys_set_tid_address
,
sys32_mount
,
sys_ustat
,
sys_setxattr
/*
170
*/
.
word
sys_lsetxattr
,
sys_fsetxattr
,
sys_getxattr
,
sys_lgetxattr
,
sys32_getdents
...
...
@@ -172,7 +172,7 @@ sunos_sys_table:
.
word
compat_sys_setitimer
,
sunos_nosys
,
sys_swapon
.
word
compat_sys_getitimer
,
sys_gethostname
,
sys_sethostname
.
word
sunos_getdtablesize
,
sys_dup2
,
sunos_nop
.
word
sys32
_fcntl
,
sunos_select
,
sunos_nop
.
word
compat_sys
_fcntl
,
sunos_select
,
sunos_nop
.
word
sys_fsync
,
sys_setpriority32
,
sys_socket
.
word
sys_connect
,
sunos_accept
/*
100
*/
.
word
sys_getpriority
,
sunos_send
,
sunos_recv
...
...
arch/sparc64/kernel/us3_cpufreq.c
View file @
cf3e3d83
...
...
@@ -79,9 +79,9 @@ static int us3_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
void
*
data
)
{
struct
cpufreq_freqs
*
freq
=
data
;
#ifdef CONFIG_SMP
unsigned
int
cpu
=
freq
->
cpu
;
#ifdef CONFIG_SMP
if
(
!
us3_freq_table
[
cpu
].
ref_freq
)
{
us3_freq_table
[
cpu
].
ref_freq
=
freq
->
old
;
us3_freq_table
[
cpu
].
udelay_val_ref
=
cpu_data
[
cpu
].
udelay_val
;
...
...
include/asm-sparc64/compat.h
View file @
cf3e3d83
...
...
@@ -64,6 +64,19 @@ struct compat_flock {
short
__unused
;
};
#define F_GETLK64 12
#define F_SETLK64 13
#define F_SETLKW64 14
struct
compat_flock64
{
short
l_type
;
short
l_whence
;
compat_loff_t
l_start
;
compat_loff_t
l_len
;
compat_pid_t
l_pid
;
short
__unused
;
};
struct
compat_statfs
{
int
f_type
;
int
f_bsize
;
...
...
@@ -84,4 +97,7 @@ typedef u32 compat_old_sigset_t;
typedef
u32
compat_sigset_word
;
#define COMPAT_OFF_T_MAX 0x7fffffff
#define COMPAT_LOFF_T_MAX 0x7fffffffffffffffL
#endif
/* _ASM_SPARC64_COMPAT_H */
include/asm-sparc64/fcntl.h
View file @
cf3e3d83
...
...
@@ -36,12 +36,6 @@
#define F_SETSIG 10
/* for sockets. */
#define F_GETSIG 11
/* for sockets. */
#ifdef __KERNEL__
#define F_GETLK64 12
#define F_SETLK64 13
#define F_SETLKW64 14
#endif
/* for F_[GET|SET]FL */
#define FD_CLOEXEC 1
/* actually anything with low bit set goes */
...
...
@@ -78,9 +72,6 @@ struct flock {
short
__unused
;
};
#ifdef __KERNEL__
#define flock64 flock
#endif
#define F_LINUX_SPECIFIC_BASE 1024
#endif
/* !(_SPARC64_FCNTL_H) */
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment