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
f698b940
Commit
f698b940
authored
Nov 23, 2002
by
Jeff Dike
Browse files
Options
Browse Files
Download
Plain Diff
Merge uml.karaya.com:/home/jdike/linux/2.5/linus-2.5
into uml.karaya.com:/home/jdike/linux/2.5/updates-2.5
parents
cebce9d8
fc0ff28c
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
31 additions
and
31 deletions
+31
-31
arch/um/Kconfig
arch/um/Kconfig
+1
-0
arch/um/drivers/line.c
arch/um/drivers/line.c
+1
-0
arch/um/kernel/sys_call_table.c
arch/um/kernel/sys_call_table.c
+7
-8
arch/um/kernel/sysrq.c
arch/um/kernel/sysrq.c
+4
-4
arch/um/sys-i386/Makefile
arch/um/sys-i386/Makefile
+16
-18
arch/um/uml.lds.S
arch/um/uml.lds.S
+1
-0
include/asm-um/uaccess.h
include/asm-um/uaccess.h
+1
-1
No files found.
arch/um/Kconfig
View file @
f698b940
...
...
@@ -128,6 +128,7 @@ source "net/Kconfig"
source "fs/Kconfig"
source "lib/Kconfig"
menu "SCSI support"
...
...
arch/um/drivers/line.c
View file @
f698b940
...
...
@@ -13,6 +13,7 @@
#include "line.h"
#include "kern.h"
#include "user_util.h"
#include "kern_util.h"
#include "os.h"
#define LINE_BUFSIZE 4096
...
...
arch/um/kernel/sys_call_table.c
View file @
f698b940
...
...
@@ -125,10 +125,8 @@ extern syscall_handler_t sys_ni_syscall;
extern
syscall_handler_t
sys_adjtimex
;
extern
syscall_handler_t
sys_mprotect
;
extern
syscall_handler_t
sys_sigprocmask
;
extern
syscall_handler_t
sys_create_module
;
extern
syscall_handler_t
sys_init_module
;
extern
syscall_handler_t
sys_delete_module
;
extern
syscall_handler_t
sys_get_kernel_syms
;
extern
syscall_handler_t
sys_quotactl
;
extern
syscall_handler_t
sys_getpgid
;
extern
syscall_handler_t
sys_fchdir
;
...
...
@@ -162,7 +160,6 @@ extern syscall_handler_t sys_mremap;
extern
syscall_handler_t
sys_setresuid16
;
extern
syscall_handler_t
sys_getresuid16
;
extern
syscall_handler_t
sys_ni_syscall
;
extern
syscall_handler_t
sys_query_module
;
extern
syscall_handler_t
sys_poll
;
extern
syscall_handler_t
sys_nfsservctl
;
extern
syscall_handler_t
sys_setresgid16
;
...
...
@@ -236,9 +233,10 @@ extern syscall_handler_t sys_epoll_create;
extern
syscall_handler_t
sys_epoll_ctl
;
extern
syscall_handler_t
sys_epoll_wait
;
extern
syscall_handler_t
sys_remap_file_pages
;
extern
syscall_handler_t
sys_set_tid_address
;
#if CONFIG_NFSD
#define NFSSERVCTL sys_nfsserctl
#define NFSSERVCTL sys_nfsser
v
ctl
#else
#define NFSSERVCTL sys_ni_syscall
#endif
...
...
@@ -247,7 +245,7 @@ extern syscall_handler_t um_mount;
extern
syscall_handler_t
um_time
;
extern
syscall_handler_t
um_stime
;
#define LAST_GENERIC_SYSCALL __NR_
remap_file_page
s
#define LAST_GENERIC_SYSCALL __NR_
set_tid_addres
s
#if LAST_GENERIC_SYSCALL > LAST_ARCH_SYSCALL
#define LAST_SYSCALL LAST_GENERIC_SYSCALL
...
...
@@ -385,10 +383,10 @@ syscall_handler_t *sys_call_table[] = {
[
__NR_adjtimex
]
=
sys_adjtimex
,
[
__NR_mprotect
]
=
sys_mprotect
,
[
__NR_sigprocmask
]
=
sys_sigprocmask
,
[
__NR_create_module
]
=
sys_
create_module
,
[
__NR_create_module
]
=
sys_
ni_syscall
,
[
__NR_init_module
]
=
sys_init_module
,
[
__NR_delete_module
]
=
sys_delete_module
,
[
__NR_get_kernel_syms
]
=
sys_
get_kernel_syms
,
[
__NR_get_kernel_syms
]
=
sys_
ni_syscall
,
[
__NR_quotactl
]
=
sys_quotactl
,
[
__NR_getpgid
]
=
sys_getpgid
,
[
__NR_fchdir
]
=
sys_fchdir
,
...
...
@@ -425,7 +423,7 @@ syscall_handler_t *sys_call_table[] = {
[
__NR_setresuid
]
=
sys_setresuid16
,
[
__NR_getresuid
]
=
sys_getresuid16
,
[
__NR_vm86
]
=
sys_ni_syscall
,
[
__NR_query_module
]
=
sys_
query_module
,
[
__NR_query_module
]
=
sys_
ni_syscall
,
[
__NR_poll
]
=
sys_poll
,
[
__NR_nfsservctl
]
=
NFSSERVCTL
,
[
__NR_setresgid
]
=
sys_setresgid16
,
...
...
@@ -491,6 +489,7 @@ syscall_handler_t *sys_call_table[] = {
[
__NR_sys_epoll_ctl
]
=
sys_epoll_ctl
,
[
__NR_sys_epoll_wait
]
=
sys_epoll_wait
,
[
__NR_remap_file_pages
]
=
sys_remap_file_pages
,
[
__NR_set_tid_address
]
=
sys_set_tid_address
,
ARCH_SYSCALLS
[
LAST_SYSCALL
+
1
...
NR_syscalls
]
=
...
...
arch/um/kernel/sysrq.c
View file @
f698b940
...
...
@@ -19,8 +19,8 @@
#ifdef CONFIG_MODULES
extern
struct
module
*
module_list
;
extern
struct
module
kernel_module
;
/* FIXME: Accessed without a lock --RR */
extern
struct
list_head
modules
;
static
inline
int
kernel_text_address
(
unsigned
long
addr
)
{
...
...
@@ -31,11 +31,11 @@ static inline int kernel_text_address(unsigned long addr)
addr
<=
(
unsigned
long
)
&
_etext
)
return
1
;
for
(
mod
=
module_list
;
mod
!=
&
kernel_module
;
mod
=
mod
->
nex
t
)
{
list_for_each_entry
(
mod
,
&
modules
,
lis
t
)
{
/* mod_bound tests for addr being inside the vmalloc'ed
* module area. Of course it'd be better to test only
* for the .text subset... */
if
(
mod_bound
(
addr
,
0
,
mod
))
{
if
(
mod_bound
(
(
void
*
)
addr
,
0
,
mod
))
{
retval
=
1
;
break
;
}
...
...
arch/um/sys-i386/Makefile
View file @
f698b940
obj-y
=
bugs.o checksum.o extable.o fault.o ksyms.o ldt.o
\
obj-y
=
bugs.o checksum.o extable.o fault.o ksyms.o ldt.o
module.o
\
ptrace.o ptrace_user.o semaphore.o sigcontext.o syscalls.o sysrq.o
obj-$(CONFIG_HIGHMEM)
+=
highmem.o
...
...
@@ -6,30 +6,28 @@ obj-$(CONFIG_HIGHMEM) += highmem.o
export-objs
=
ksyms.o
USER_OBJS
:=
bugs.o ptrace_user.o sigcontext.o fault.o
USER_OBJS
:=
$(
foreach
file,
$(USER_OBJS)
,
arch/um/sys-i386
/
$(file)
)
USER_OBJS
:=
$(
foreach
file,
$(USER_OBJS)
,
$(obj)
/
$(file)
)
SYMLINKS
=
semaphore.c
checksum.S extable.c highmem
.c
SYMLINKS
=
semaphore.c
extable.c highmem.c module
.c
include
$(TOPDIR)/Rules.make
semaphore.c-dir
=
kernel
extable.c-dir
=
mm
highmem.c-dir
=
mm
module.c-dir
=
kernel
$(USER_OBJS)
:
%.o: %.c
$(CC)
$
(
CFLAGS_
$@
)
$(USER_CFLAGS)
-c
-o
$@
$<
define
make_link
-rm
-f
$1
ln
-sf
$(TOPDIR)/arch/i386/$($(notdir
$1)-dir)/$(notdir
$1)
$1
endef
arch/um/sys-i386/checksum.S
:
-
rm
-f
$@
-
ln
-s
$(TOPDIR)
/arch/i386/lib/
$(
notdir
$@
)
$@
include
$(TOPDIR)/Rules.make
arch/um/sys-i386/semaphore.c
:
-
rm
-f
$@
-
ln
-s
$(TOPDIR)
/arch/i386/kernel/
$(
notdir
$@
)
$@
$(USER_OBJS)
:
%.o: %.c
$(CC)
$
(
CFLAGS_
$(
notdir
$@
)
)
$(USER_CFLAGS)
-c
-o
$@
$<
arch/um/sys-i386/extable.c
:
-
rm
-f
$@
-
ln
-s
$(TOPDIR)
/arch/i386/mm/
$(
notdir
$@
)
$@
$(foreach f,$(SYMLINKS),$(src)/$f)
:
$(
call
make_link,
$@
)
arch/um/sys-i386/highmem.c
:
-
rm
-f
$@
-
ln
-s
$(TOPDIR)
/arch/i386/mm/
$(
notdir
$@
)
$@
clean
:
$(MAKE)
-C
util clean
...
...
arch/um/uml.lds.S
View file @
f698b940
...
...
@@ -38,6 +38,7 @@ SECTIONS
__ex_table
:
{
*(
__ex_table
)
}
__stop___ex_table
=
.
;
.
=
ALIGN
(
64
)
;
__start___ksymtab
=
.
; /* Kernel symbol table */
__ksymtab
:
{
*(
__ksymtab
)
}
__stop___ksymtab
=
.
;
...
...
include/asm-um/uaccess.h
View file @
f698b940
...
...
@@ -164,7 +164,7 @@ static inline int clear_user(void *mem, int len)
extern
int
__do_strnlen_user
(
const
char
*
str
,
unsigned
long
n
,
void
**
fault_addr
,
void
**
fault_catcher
);
static
inline
int
strnlen_user
(
void
*
str
,
int
len
)
static
inline
int
strnlen_user
(
const
void
*
str
,
int
len
)
{
return
(
__do_strnlen_user
(
str
,
len
,
&
current
->
thread
.
fault_addr
,
...
...
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