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
04345692
Commit
04345692
authored
Sep 29, 2002
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/davem/BK/net-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
parents
f32a9e2a
5b5a877d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
2 deletions
+10
-2
drivers/net/8139cp.c
drivers/net/8139cp.c
+6
-0
fs/proc/array.c
fs/proc/array.c
+4
-2
No files found.
drivers/net/8139cp.c
View file @
04345692
...
...
@@ -991,6 +991,8 @@ static struct net_device_stats *cp_get_stats(struct net_device *dev)
static
void
cp_stop_hw
(
struct
cp_private
*
cp
)
{
struct
net_device
*
dev
=
cp
->
dev
;
cpw16
(
IntrMask
,
0
);
cpr16
(
IntrMask
);
cpw8
(
Cmd
,
0
);
...
...
@@ -1002,6 +1004,10 @@ static void cp_stop_hw (struct cp_private *cp)
cp
->
rx_tail
=
0
;
cp
->
tx_head
=
cp
->
tx_tail
=
0
;
(
void
)
dev
;
/* avoid compiler warning when synchronize_irq()
* disappears during !CONFIG_SMP
*/
}
static
void
cp_reset_hw
(
struct
cp_private
*
cp
)
...
...
fs/proc/array.c
View file @
04345692
...
...
@@ -228,8 +228,9 @@ static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
sigemptyset
(
ign
);
sigemptyset
(
catch
);
spin_lock_irq
(
&
p
->
sig
->
sig
lock
);
read_lock
(
&
tasklist_
lock
);
if
(
p
->
sig
)
{
spin_lock_irq
(
&
p
->
sig
->
siglock
);
k
=
p
->
sig
->
action
;
for
(
i
=
1
;
i
<=
_NSIG
;
++
i
,
++
k
)
{
if
(
k
->
sa
.
sa_handler
==
SIG_IGN
)
...
...
@@ -237,8 +238,9 @@ static void collect_sigign_sigcatch(struct task_struct *p, sigset_t *ign,
else
if
(
k
->
sa
.
sa_handler
!=
SIG_DFL
)
sigaddset
(
catch
,
i
);
}
spin_unlock_irq
(
&
p
->
sig
->
siglock
);
}
spin_unlock_irq
(
&
p
->
sig
->
sig
lock
);
read_unlock
(
&
tasklist_
lock
);
}
static
inline
char
*
task_sig
(
struct
task_struct
*
p
,
char
*
buffer
)
...
...
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