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
9cee3a47
Commit
9cee3a47
authored
Nov 16, 2004
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge
bk://linux-mtd.bkbits.net/mtd-bugsonly-2.6
into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents
a567a70e
bf93c797
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
5 deletions
+3
-5
drivers/block/ll_rw_blk.c
drivers/block/ll_rw_blk.c
+1
-1
kernel/fork.c
kernel/fork.c
+1
-4
net/sched/police.c
net/sched/police.c
+1
-0
No files found.
drivers/block/ll_rw_blk.c
View file @
9cee3a47
...
...
@@ -1651,7 +1651,7 @@ static struct request *get_request(request_queue_t *q, int rw, int gfp_mask)
struct
io_context
*
ioc
=
get_io_context
(
gfp_mask
);
if
(
unlikely
(
test_bit
(
QUEUE_FLAG_DRAIN
,
&
q
->
queue_flags
)))
return
NULL
;
goto
out
;
spin_lock_irq
(
q
->
queue_lock
);
if
(
rl
->
count
[
rw
]
+
1
>=
q
->
nr_requests
)
{
...
...
kernel/fork.c
View file @
9cee3a47
...
...
@@ -118,10 +118,7 @@ void __init fork_init(unsigned long mempages)
* value: the thread structures can take up at most half
* of memory.
*/
if
(
THREAD_SIZE
>=
PAGE_SIZE
)
max_threads
=
mempages
/
(
THREAD_SIZE
/
PAGE_SIZE
)
/
8
;
else
max_threads
=
mempages
/
8
;
max_threads
=
mempages
/
(
8
*
THREAD_SIZE
/
PAGE_SIZE
);
/*
* we need to allow at least 20 threads to boot a system
...
...
net/sched/police.c
View file @
9cee3a47
...
...
@@ -576,6 +576,7 @@ int tcf_police_dump_stats(struct sk_buff *skb, struct tcf_police *p)
if
(
gnet_stats_start_copy_compat
(
skb
,
TCA_STATS2
,
TCA_STATS
,
TCA_XSTATS
,
p
->
stats_lock
,
&
d
)
<
0
)
goto
errout
;
if
(
gnet_stats_copy_basic
(
&
d
,
&
p
->
bstats
)
<
0
||
#ifdef CONFIG_NET_ESTIMATOR
...
...
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