Commit 9cee3a47 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linux-mtd.bkbits.net/mtd-bugsonly-2.6

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents a567a70e bf93c797
...@@ -1651,7 +1651,7 @@ static struct request *get_request(request_queue_t *q, int rw, int gfp_mask) ...@@ -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); struct io_context *ioc = get_io_context(gfp_mask);
if (unlikely(test_bit(QUEUE_FLAG_DRAIN, &q->queue_flags))) if (unlikely(test_bit(QUEUE_FLAG_DRAIN, &q->queue_flags)))
return NULL; goto out;
spin_lock_irq(q->queue_lock); spin_lock_irq(q->queue_lock);
if (rl->count[rw]+1 >= q->nr_requests) { if (rl->count[rw]+1 >= q->nr_requests) {
......
...@@ -118,10 +118,7 @@ void __init fork_init(unsigned long mempages) ...@@ -118,10 +118,7 @@ void __init fork_init(unsigned long mempages)
* value: the thread structures can take up at most half * value: the thread structures can take up at most half
* of memory. * of memory.
*/ */
if (THREAD_SIZE >= PAGE_SIZE) max_threads = mempages / (8 * THREAD_SIZE / PAGE_SIZE);
max_threads = mempages / (THREAD_SIZE/PAGE_SIZE) / 8;
else
max_threads = mempages / 8;
/* /*
* we need to allow at least 20 threads to boot a system * we need to allow at least 20 threads to boot a system
......
...@@ -576,6 +576,7 @@ int tcf_police_dump_stats(struct sk_buff *skb, struct tcf_police *p) ...@@ -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, if (gnet_stats_start_copy_compat(skb, TCA_STATS2, TCA_STATS,
TCA_XSTATS, p->stats_lock, &d) < 0) TCA_XSTATS, p->stats_lock, &d) < 0)
goto errout;
if (gnet_stats_copy_basic(&d, &p->bstats) < 0 || if (gnet_stats_copy_basic(&d, &p->bstats) < 0 ||
#ifdef CONFIG_NET_ESTIMATOR #ifdef CONFIG_NET_ESTIMATOR
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment