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
a442806d
Commit
a442806d
authored
Sep 21, 2003
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://kernel.bkbits.net/davem/net-2.5
into home.osdl.org:/home/torvalds/v2.5/linux
parents
8090fa24
863c4a16
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
17 additions
and
28 deletions
+17
-28
arch/arm/kernel/ecard.c
arch/arm/kernel/ecard.c
+1
-2
arch/i386/kernel/apm.c
arch/i386/kernel/apm.c
+1
-1
arch/ia64/sn/io/sn2/shub.c
arch/ia64/sn/io/sn2/shub.c
+1
-1
drivers/block/loop.c
drivers/block/loop.c
+1
-1
drivers/ieee1394/nodemgr.c
drivers/ieee1394/nodemgr.c
+1
-2
drivers/input/serio/serio.c
drivers/input/serio/serio.c
+1
-2
drivers/isdn/hardware/eicon/divasmain.c
drivers/isdn/hardware/eicon/divasmain.c
+0
-1
drivers/isdn/hardware/eicon/i4lididrv.c
drivers/isdn/hardware/eicon/i4lididrv.c
+1
-1
drivers/macintosh/adb.c
drivers/macintosh/adb.c
+1
-2
drivers/macintosh/mediabay.c
drivers/macintosh/mediabay.c
+1
-2
drivers/mtd/mtd_blkdevs.c
drivers/mtd/mtd_blkdevs.c
+1
-2
drivers/usb/core/hub.c
drivers/usb/core/hub.c
+1
-2
fs/jffs/inode-v23.c
fs/jffs/inode-v23.c
+1
-1
fs/jfs/super.c
fs/jfs/super.c
+3
-6
net/bluetooth/bnep/core.c
net/bluetooth/bnep/core.c
+1
-1
net/bluetooth/rfcomm/core.c
net/bluetooth/rfcomm/core.c
+1
-1
No files found.
arch/arm/kernel/ecard.c
View file @
a442806d
...
@@ -329,8 +329,7 @@ ecard_call(struct ecard_request *req)
...
@@ -329,8 +329,7 @@ ecard_call(struct ecard_request *req)
BUG
();
BUG
();
if
(
ecard_pid
<=
0
)
if
(
ecard_pid
<=
0
)
ecard_pid
=
kernel_thread
(
ecard_task
,
NULL
,
ecard_pid
=
kernel_thread
(
ecard_task
,
NULL
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
ecard_req
=
req
;
ecard_req
=
req
;
wake_up
(
&
ecard_wait
);
wake_up
(
&
ecard_wait
);
...
...
arch/i386/kernel/apm.c
View file @
a442806d
...
@@ -2008,7 +2008,7 @@ static int __init apm_init(void)
...
@@ -2008,7 +2008,7 @@ static int __init apm_init(void)
if
(
apm_proc
)
if
(
apm_proc
)
apm_proc
->
owner
=
THIS_MODULE
;
apm_proc
->
owner
=
THIS_MODULE
;
kernel_thread
(
apm
,
NULL
,
CLONE_
FS
|
CLONE_FILES
|
CLONE_SIGHAND
|
SIGCHLD
);
kernel_thread
(
apm
,
NULL
,
CLONE_
KERNEL
|
SIGCHLD
);
if
(
num_online_cpus
()
>
1
&&
!
smp
)
{
if
(
num_online_cpus
()
>
1
&&
!
smp
)
{
printk
(
KERN_NOTICE
printk
(
KERN_NOTICE
...
...
arch/ia64/sn/io/sn2/shub.c
View file @
a442806d
...
@@ -493,7 +493,7 @@ linkstatd_init(void)
...
@@ -493,7 +493,7 @@ linkstatd_init(void)
spin_lock_init
(
&
sn_linkstats_lock
);
spin_lock_init
(
&
sn_linkstats_lock
);
sn_linkstats
=
kmalloc
(
numnodes
*
sizeof
(
struct
s_linkstats
),
GFP_KERNEL
);
sn_linkstats
=
kmalloc
(
numnodes
*
sizeof
(
struct
s_linkstats
),
GFP_KERNEL
);
sn_linkstats_reset
(
60000UL
);
/* default 60 second update interval */
sn_linkstats_reset
(
60000UL
);
/* default 60 second update interval */
kernel_thread
(
linkstatd_thread
,
NULL
,
CLONE_
FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
kernel_thread
(
linkstatd_thread
,
NULL
,
CLONE_
KERNEL
);
return
0
;
return
0
;
}
}
...
...
drivers/block/loop.c
View file @
a442806d
...
@@ -757,7 +757,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
...
@@ -757,7 +757,7 @@ static int loop_set_fd(struct loop_device *lo, struct file *lo_file,
blk_queue_merge_bvec
(
lo
->
lo_queue
,
q
->
merge_bvec_fn
);
blk_queue_merge_bvec
(
lo
->
lo_queue
,
q
->
merge_bvec_fn
);
}
}
kernel_thread
(
loop_thread
,
lo
,
CLONE_
FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
kernel_thread
(
loop_thread
,
lo
,
CLONE_
KERNEL
);
down
(
&
lo
->
lo_sem
);
down
(
&
lo
->
lo_sem
);
fput
(
file
);
fput
(
file
);
...
...
drivers/ieee1394/nodemgr.c
View file @
a442806d
...
@@ -1744,8 +1744,7 @@ static void nodemgr_add_host(struct hpsb_host *host)
...
@@ -1744,8 +1744,7 @@ static void nodemgr_add_host(struct hpsb_host *host)
sprintf
(
hi
->
daemon_name
,
"knodemgrd_%d"
,
host
->
id
);
sprintf
(
hi
->
daemon_name
,
"knodemgrd_%d"
,
host
->
id
);
hi
->
pid
=
kernel_thread
(
nodemgr_host_thread
,
hi
,
hi
->
pid
=
kernel_thread
(
nodemgr_host_thread
,
hi
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
if
(
hi
->
pid
<
0
)
{
if
(
hi
->
pid
<
0
)
{
HPSB_ERR
(
"NodeMgr: failed to start %s thread for %s"
,
HPSB_ERR
(
"NodeMgr: failed to start %s thread for %s"
,
...
...
drivers/input/serio/serio.c
View file @
a442806d
...
@@ -248,8 +248,7 @@ static int __init serio_init(void)
...
@@ -248,8 +248,7 @@ static int __init serio_init(void)
{
{
int
pid
;
int
pid
;
pid
=
kernel_thread
(
serio_thread
,
NULL
,
pid
=
kernel_thread
(
serio_thread
,
NULL
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
if
(
!
pid
)
{
if
(
!
pid
)
{
printk
(
KERN_WARNING
"serio: Failed to start kseriod
\n
"
);
printk
(
KERN_WARNING
"serio: Failed to start kseriod
\n
"
);
...
...
drivers/isdn/hardware/eicon/divasmain.c
View file @
a442806d
...
@@ -45,7 +45,6 @@
...
@@ -45,7 +45,6 @@
static
char
*
main_revision
=
"$Revision: 1.40 $"
;
static
char
*
main_revision
=
"$Revision: 1.40 $"
;
int
errno
=
0
;
static
int
major
;
static
int
major
;
static
int
dbgmask
;
static
int
dbgmask
;
...
...
drivers/isdn/hardware/eicon/i4lididrv.c
View file @
a442806d
...
@@ -293,7 +293,7 @@ diva_init_thread(void)
...
@@ -293,7 +293,7 @@ diva_init_thread(void)
{
{
int
pid
=
0
;
int
pid
=
0
;
pid
=
kernel_thread
(
divad_thread
,
NULL
,
CLONE_
FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
pid
=
kernel_thread
(
divad_thread
,
NULL
,
CLONE_
KERNEL
);
if
(
pid
>=
0
)
{
if
(
pid
>=
0
)
{
divad_pid
=
pid
;
divad_pid
=
pid
;
}
}
...
...
drivers/macintosh/adb.c
View file @
a442806d
...
@@ -266,8 +266,7 @@ adb_probe_task(void *x)
...
@@ -266,8 +266,7 @@ adb_probe_task(void *x)
static
void
static
void
__adb_probe_task
(
void
*
data
)
__adb_probe_task
(
void
*
data
)
{
{
adb_probe_task_pid
=
kernel_thread
(
adb_probe_task
,
NULL
,
adb_probe_task_pid
=
kernel_thread
(
adb_probe_task
,
NULL
,
SIGCHLD
|
CLONE_KERNEL
);
SIGCHLD
|
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
}
}
static
DECLARE_WORK
(
adb_reset_work
,
__adb_probe_task
,
NULL
);
static
DECLARE_WORK
(
adb_reset_work
,
__adb_probe_task
,
NULL
);
...
...
drivers/macintosh/mediabay.c
View file @
a442806d
...
@@ -694,8 +694,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_ma
...
@@ -694,8 +694,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_ma
/* Startup kernel thread */
/* Startup kernel thread */
if
(
i
==
0
)
if
(
i
==
0
)
kernel_thread
(
media_bay_task
,
NULL
,
kernel_thread
(
media_bay_task
,
NULL
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
return
0
;
return
0
;
...
...
drivers/mtd/mtd_blkdevs.c
View file @
a442806d
...
@@ -397,8 +397,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
...
@@ -397,8 +397,7 @@ int register_mtd_blktrans(struct mtd_blktrans_ops *tr)
tr
->
blkcore_priv
->
rq
->
queuedata
=
tr
;
tr
->
blkcore_priv
->
rq
->
queuedata
=
tr
;
ret
=
kernel_thread
(
mtd_blktrans_thread
,
tr
,
ret
=
kernel_thread
(
mtd_blktrans_thread
,
tr
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
blk_cleanup_queue
(
tr
->
blkcore_priv
->
rq
);
blk_cleanup_queue
(
tr
->
blkcore_priv
->
rq
);
unregister_blkdev
(
tr
->
major
,
tr
->
name
);
unregister_blkdev
(
tr
->
major
,
tr
->
name
);
...
...
drivers/usb/core/hub.c
View file @
a442806d
...
@@ -1182,8 +1182,7 @@ int usb_hub_init(void)
...
@@ -1182,8 +1182,7 @@ int usb_hub_init(void)
return
-
1
;
return
-
1
;
}
}
pid
=
kernel_thread
(
hub_thread
,
NULL
,
pid
=
kernel_thread
(
hub_thread
,
NULL
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
if
(
pid
>=
0
)
{
if
(
pid
>=
0
)
{
khubd_pid
=
pid
;
khubd_pid
=
pid
;
...
...
fs/jffs/inode-v23.c
View file @
a442806d
...
@@ -139,7 +139,7 @@ static int jffs_fill_super(struct super_block *sb, void *data, int silent)
...
@@ -139,7 +139,7 @@ static int jffs_fill_super(struct super_block *sb, void *data, int silent)
c
->
thread_pid
=
kernel_thread
(
jffs_garbage_collect_thread
,
c
->
thread_pid
=
kernel_thread
(
jffs_garbage_collect_thread
,
(
void
*
)
c
,
(
void
*
)
c
,
CLONE_
FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
CLONE_
KERNEL
);
D1
(
printk
(
KERN_NOTICE
"JFFS: GC thread pid=%d.
\n
"
,
(
int
)
c
->
thread_pid
));
D1
(
printk
(
KERN_NOTICE
"JFFS: GC thread pid=%d.
\n
"
,
(
int
)
c
->
thread_pid
));
D1
(
printk
(
KERN_NOTICE
"JFFS: Successfully mounted device %s.
\n
"
,
D1
(
printk
(
KERN_NOTICE
"JFFS: Successfully mounted device %s.
\n
"
,
...
...
fs/jfs/super.c
View file @
a442806d
...
@@ -501,24 +501,21 @@ static int __init init_jfs_fs(void)
...
@@ -501,24 +501,21 @@ static int __init init_jfs_fs(void)
/*
/*
* I/O completion thread (endio)
* I/O completion thread (endio)
*/
*/
jfsIOthread
=
kernel_thread
(
jfsIOWait
,
0
,
jfsIOthread
=
kernel_thread
(
jfsIOWait
,
0
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
if
(
jfsIOthread
<
0
)
{
if
(
jfsIOthread
<
0
)
{
jfs_err
(
"init_jfs_fs: fork failed w/rc = %d"
,
jfsIOthread
);
jfs_err
(
"init_jfs_fs: fork failed w/rc = %d"
,
jfsIOthread
);
goto
end_txmngr
;
goto
end_txmngr
;
}
}
wait_for_completion
(
&
jfsIOwait
);
/* Wait until thread starts */
wait_for_completion
(
&
jfsIOwait
);
/* Wait until thread starts */
jfsCommitThread
=
kernel_thread
(
jfs_lazycommit
,
0
,
jfsCommitThread
=
kernel_thread
(
jfs_lazycommit
,
0
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
if
(
jfsCommitThread
<
0
)
{
if
(
jfsCommitThread
<
0
)
{
jfs_err
(
"init_jfs_fs: fork failed w/rc = %d"
,
jfsCommitThread
);
jfs_err
(
"init_jfs_fs: fork failed w/rc = %d"
,
jfsCommitThread
);
goto
kill_iotask
;
goto
kill_iotask
;
}
}
wait_for_completion
(
&
jfsIOwait
);
/* Wait until thread starts */
wait_for_completion
(
&
jfsIOwait
);
/* Wait until thread starts */
jfsSyncThread
=
kernel_thread
(
jfs_sync
,
0
,
jfsSyncThread
=
kernel_thread
(
jfs_sync
,
0
,
CLONE_KERNEL
);
CLONE_FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
if
(
jfsSyncThread
<
0
)
{
if
(
jfsSyncThread
<
0
)
{
jfs_err
(
"init_jfs_fs: fork failed w/rc = %d"
,
jfsSyncThread
);
jfs_err
(
"init_jfs_fs: fork failed w/rc = %d"
,
jfsSyncThread
);
goto
kill_committask
;
goto
kill_committask
;
...
...
net/bluetooth/bnep/core.c
View file @
a442806d
...
@@ -574,7 +574,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
...
@@ -574,7 +574,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
__bnep_link_session
(
s
);
__bnep_link_session
(
s
);
err
=
kernel_thread
(
bnep_session
,
s
,
CLONE_
FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
err
=
kernel_thread
(
bnep_session
,
s
,
CLONE_
KERNEL
);
if
(
err
<
0
)
{
if
(
err
<
0
)
{
/* Session thread start failed, gotta cleanup. */
/* Session thread start failed, gotta cleanup. */
unregister_netdev
(
dev
);
unregister_netdev
(
dev
);
...
...
net/bluetooth/rfcomm/core.c
View file @
a442806d
...
@@ -1957,7 +1957,7 @@ int __init rfcomm_init(void)
...
@@ -1957,7 +1957,7 @@ int __init rfcomm_init(void)
{
{
l2cap_load
();
l2cap_load
();
kernel_thread
(
rfcomm_run
,
NULL
,
CLONE_
FS
|
CLONE_FILES
|
CLONE_SIGHAND
);
kernel_thread
(
rfcomm_run
,
NULL
,
CLONE_
KERNEL
);
BT_INFO
(
"RFCOMM ver %s"
,
VERSION
);
BT_INFO
(
"RFCOMM ver %s"
,
VERSION
);
...
...
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