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
Kirill Smelkov
linux
Commits
91e0c6b0
Commit
91e0c6b0
authored
Dec 26, 2002
by
Jeff Dike
Committed by
Jeff Dike
Dec 26, 2002
Browse files
Options
Browse Files
Download
Plain Diff
Merge jdike.stearns.org:linux/fixes-2.5
into uml.karaya.com:/home/jdike/linux/2.5/fixes-2.5
parents
ec08a08e
59dce822
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
21 additions
and
77 deletions
+21
-77
arch/um/Makefile
arch/um/Makefile
+0
-4
arch/um/boot/Makefile
arch/um/boot/Makefile
+0
-3
arch/um/drivers/port_kern.c
arch/um/drivers/port_kern.c
+11
-11
arch/um/drivers/port_user.c
arch/um/drivers/port_user.c
+0
-36
arch/um/drivers/ubd_user.c
arch/um/drivers/ubd_user.c
+2
-0
arch/um/drivers/xterm_kern.c
arch/um/drivers/xterm_kern.c
+4
-2
arch/um/kernel/irq_user.c
arch/um/kernel/irq_user.c
+1
-0
arch/um/kernel/setup.c
arch/um/kernel/setup.c
+0
-20
arch/um/kernel/tempfile.c
arch/um/kernel/tempfile.c
+2
-1
arch/um/os-Linux/file.c
arch/um/os-Linux/file.c
+1
-0
No files found.
arch/um/Makefile
View file @
91e0c6b0
...
@@ -11,8 +11,6 @@ include/linux/version.h: arch/$(ARCH)/Makefile
...
@@ -11,8 +11,6 @@ include/linux/version.h: arch/$(ARCH)/Makefile
# EXTRAVERSION...
# EXTRAVERSION...
MODLIB
:=
$(INSTALL_MOD_PATH)
/lib/modules/
$(KERNELRELEASE)
MODLIB
:=
$(INSTALL_MOD_PATH)
/lib/modules/
$(KERNELRELEASE)
MAKEBOOT
=
$(MAKE)
-C
$(ARCH_DIR)
/boot
ifeq
($(CONFIG_DEBUGSYM),y)
ifeq
($(CONFIG_DEBUGSYM),y)
DEBUG
=
-g
DEBUG
=
-g
CFLAGS
:=
$(
subst
-fomit-frame-pointer
,,
$(CFLAGS)
)
CFLAGS
:=
$(
subst
-fomit-frame-pointer
,,
$(CFLAGS)
)
...
@@ -106,11 +104,9 @@ archclean: sysclean
...
@@ -106,11 +104,9 @@ archclean: sysclean
find
.
\(
-name
'*.bb'
-o
-name
'*.bbg'
-o
-name
'*.da'
\
find
.
\(
-name
'*.bb'
-o
-name
'*.bbg'
-o
-name
'*.da'
\
-o
-name
'*.gcov'
\)
-type
f
-print
| xargs
rm
-f
-o
-name
'*.gcov'
\)
-type
f
-print
| xargs
rm
-f
rm
-f
linux x.i gmon.out
$(ARCH_DIR)
/link.ld
$(GEN_HEADERS)
rm
-f
linux x.i gmon.out
$(ARCH_DIR)
/link.ld
$(GEN_HEADERS)
@
$(MAKEBOOT)
clean
archdep
:
archdep
:
for
d
in
$(ARCH_SUBDIRS)
;
do
$(MAKE)
-C
$$
d fastdep
;
done
for
d
in
$(ARCH_SUBDIRS)
;
do
$(MAKE)
-C
$$
d fastdep
;
done
@
$(MAKEBOOT)
dep
$(SYMLINK_HEADERS)
:
$(SYMLINK_HEADERS)
:
cd
$(TOPDIR)
/
$(
dir
$@
)
;
\
cd
$(TOPDIR)
/
$(
dir
$@
)
;
\
...
...
arch/um/boot/Makefile
deleted
100644 → 0
View file @
ec08a08e
dep
:
clean
:
arch/um/drivers/port_kern.c
View file @
91e0c6b0
...
@@ -106,7 +106,7 @@ static int port_accept(struct port_list *port)
...
@@ -106,7 +106,7 @@ static int port_accept(struct port_list *port)
kfree
(
conn
);
kfree
(
conn
);
out_close:
out_close:
os_close_file
(
fd
);
os_close_file
(
fd
);
if
(
pid
!=
-
1
)
os_kill_process
(
pid
);
if
(
pid
!=
-
1
)
os_kill_process
(
pid
,
0
);
out:
out:
return
(
ret
);
return
(
ret
);
}
}
...
@@ -210,9 +210,9 @@ void port_remove_dev(void *d)
...
@@ -210,9 +210,9 @@ void port_remove_dev(void *d)
struct
port_dev
*
dev
=
d
;
struct
port_dev
*
dev
=
d
;
if
(
dev
->
helper_pid
!=
-
1
)
if
(
dev
->
helper_pid
!=
-
1
)
os_kill_process
(
dev
->
helper_pid
);
os_kill_process
(
dev
->
helper_pid
,
0
);
if
(
dev
->
telnetd_pid
!=
-
1
)
if
(
dev
->
telnetd_pid
!=
-
1
)
os_kill_process
(
dev
->
telnetd_pid
);
os_kill_process
(
dev
->
telnetd_pid
,
0
);
dev
->
helper_pid
=
-
1
;
dev
->
helper_pid
=
-
1
;
}
}
...
@@ -275,8 +275,8 @@ void port_kern_free(void *d)
...
@@ -275,8 +275,8 @@ void port_kern_free(void *d)
{
{
struct
port_dev
*
dev
=
d
;
struct
port_dev
*
dev
=
d
;
if
(
dev
->
helper_pid
!=
-
1
)
os_kill_process
(
dev
->
telnetd_pid
);
if
(
dev
->
helper_pid
!=
-
1
)
os_kill_process
(
dev
->
telnetd_pid
,
0
);
if
(
dev
->
telnetd_pid
!=
-
1
)
os_kill_process
(
dev
->
telnetd_pid
);
if
(
dev
->
telnetd_pid
!=
-
1
)
os_kill_process
(
dev
->
telnetd_pid
,
0
);
kfree
(
dev
);
kfree
(
dev
);
}
}
...
...
arch/um/drivers/port_user.c
View file @
91e0c6b0
...
@@ -129,42 +129,6 @@ int port_listen_fd(int port)
...
@@ -129,42 +129,6 @@ int port_listen_fd(int port)
return
(
err
);
return
(
err
);
}
}
int
port_rcv_fd
(
int
fd
)
{
int
new
,
n
;
char
buf
[
CMSG_SPACE
(
sizeof
(
new
))];
struct
msghdr
msg
;
struct
cmsghdr
*
cmsg
;
msg
.
msg_name
=
NULL
;
msg
.
msg_namelen
=
0
;
msg
.
msg_iov
=
NULL
;
msg
.
msg_iovlen
=
0
;
msg
.
msg_control
=
buf
;
msg
.
msg_controllen
=
sizeof
(
buf
);
msg
.
msg_flags
=
0
;
n
=
recvmsg
(
fd
,
&
msg
,
0
);
if
(
n
<
0
){
printk
(
"rcv_fd : recvmsg failed - errno = %d
\n
"
,
errno
);
return
(
-
1
);
}
cmsg
=
CMSG_FIRSTHDR
(
&
msg
);
if
(
cmsg
==
NULL
){
printk
(
"rcv_fd didn't receive anything, error = %d
\n
"
,
errno
);
return
(
-
1
);
}
if
((
cmsg
->
cmsg_level
!=
SOL_SOCKET
)
||
(
cmsg
->
cmsg_type
!=
SCM_RIGHTS
)){
printk
(
"rcv_fd didn't receive a descriptor
\n
"
);
return
(
-
1
);
}
new
=
((
int
*
)
CMSG_DATA
(
cmsg
))[
0
];
return
(
new
);
}
struct
port_pre_exec_data
{
struct
port_pre_exec_data
{
int
sock_fd
;
int
sock_fd
;
int
pipe_fd
;
int
pipe_fd
;
...
...
arch/um/drivers/ubd_user.c
View file @
91e0c6b0
...
@@ -473,6 +473,8 @@ void do_io(struct io_thread_req *req)
...
@@ -473,6 +473,8 @@ void do_io(struct io_thread_req *req)
&
req
->
sector_mask
)
==
bit
))
&
req
->
sector_mask
)
==
bit
))
end
++
;
end
++
;
if
(
end
!=
nsectors
)
printk
(
"end != nsectors
\n
"
);
off
=
req
->
offset
+
req
->
offsets
[
bit
]
+
off
=
req
->
offset
+
req
->
offsets
[
bit
]
+
start
*
req
->
sectorsize
;
start
*
req
->
sectorsize
;
len
=
(
end
-
start
)
*
req
->
sectorsize
;
len
=
(
end
-
start
)
*
req
->
sectorsize
;
...
...
arch/um/drivers/xterm_kern.c
View file @
91e0c6b0
...
@@ -22,11 +22,13 @@ struct xterm_wait {
...
@@ -22,11 +22,13 @@ struct xterm_wait {
static
void
xterm_interrupt
(
int
irq
,
void
*
data
,
struct
pt_regs
*
regs
)
static
void
xterm_interrupt
(
int
irq
,
void
*
data
,
struct
pt_regs
*
regs
)
{
{
struct
xterm_wait
*
xterm
=
data
;
struct
xterm_wait
*
xterm
=
data
;
int
fd
;
xterm
->
new_
fd
=
os_rcv_fd
(
xterm
->
fd
,
&
xterm
->
pid
);
fd
=
os_rcv_fd
(
xterm
->
fd
,
&
xterm
->
pid
);
if
(
xterm
->
new_
fd
==
-
EAGAIN
)
if
(
fd
==
-
EAGAIN
)
return
;
return
;
xterm
->
new_fd
=
fd
;
up
(
&
xterm
->
sem
);
up
(
&
xterm
->
sem
);
}
}
...
...
arch/um/kernel/irq_user.c
View file @
91e0c6b0
...
@@ -338,6 +338,7 @@ void reactivate_fd(int fd, int irqnum)
...
@@ -338,6 +338,7 @@ void reactivate_fd(int fd, int irqnum)
irq_unlock
(
flags
);
irq_unlock
(
flags
);
return
;
return
;
}
}
pollfds
[
i
].
fd
=
irq
->
fd
;
pollfds
[
i
].
fd
=
irq
->
fd
;
irq_unlock
(
flags
);
irq_unlock
(
flags
);
...
...
arch/um/kernel/setup.c
deleted
100644 → 0
View file @
ec08a08e
/*
* Copyright (C) 2000, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include "asm/processor.h"
struct
cpuinfo_um
boot_cpu_data
=
{
loops_per_jiffy
:
0
,
ipi_pipe
:
{
-
1
,
-
1
}
};
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/kernel/tempfile.c
View file @
91e0c6b0
...
@@ -11,7 +11,8 @@
...
@@ -11,7 +11,8 @@
#include <sys/param.h>
#include <sys/param.h>
#include "init.h"
#include "init.h"
char
*
tempdir
=
NULL
;
/* Modified from create_mem_file and start_debugger */
static
char
*
tempdir
=
NULL
;
static
void
__init
find_tempdir
(
void
)
static
void
__init
find_tempdir
(
void
)
{
{
...
...
arch/um/os-Linux/file.c
View file @
91e0c6b0
...
@@ -186,6 +186,7 @@ int os_pipe(int *fds, int stream, int close_on_exec)
...
@@ -186,6 +186,7 @@ int os_pipe(int *fds, int stream, int close_on_exec)
int
os_set_fd_async
(
int
fd
,
int
owner
)
int
os_set_fd_async
(
int
fd
,
int
owner
)
{
{
/* XXX This should do F_GETFL first */
if
(
fcntl
(
fd
,
F_SETFL
,
O_ASYNC
|
O_NONBLOCK
)
<
0
){
if
(
fcntl
(
fd
,
F_SETFL
,
O_ASYNC
|
O_NONBLOCK
)
<
0
){
printk
(
"os_set_fd_async : failed to set O_ASYNC and "
printk
(
"os_set_fd_async : failed to set O_ASYNC and "
"O_NONBLOCK on fd # %d, errno = %d
\n
"
,
fd
,
errno
);
"O_NONBLOCK on fd # %d, errno = %d
\n
"
,
fd
,
errno
);
...
...
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