projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[powerpc.git]
/
block
/
ll_rw_blk.c
diff --git
a/block/ll_rw_blk.c
b/block/ll_rw_blk.c
index
c04422a
..
61d6b3c
100644
(file)
--- a/
block/ll_rw_blk.c
+++ b/
block/ll_rw_blk.c
@@
-10,7
+10,6
@@
/*
* This handles all read/write requests to block devices
*/
/*
* This handles all read/write requests to block devices
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/backing-dev.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/backing-dev.h>
@@
-2517,7
+2516,7
@@
EXPORT_SYMBOL_GPL(blk_execute_rq_nowait);
int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
struct request *rq, int at_head)
{
int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
struct request *rq, int at_head)
{
- DECLARE_COMPLETION(wait);
+ DECLARE_COMPLETION
_ONSTACK
(wait);
char sense[SCSI_SENSE_BUFFERSIZE];
int err = 0;
char sense[SCSI_SENSE_BUFFERSIZE];
int err = 0;
@@
-3117,9
+3116,9
@@
void submit_bio(int rw, struct bio *bio)
BIO_BUG_ON(!bio->bi_io_vec);
bio->bi_rw |= rw;
if (rw & WRITE)
BIO_BUG_ON(!bio->bi_io_vec);
bio->bi_rw |= rw;
if (rw & WRITE)
-
mod_page_state(pgpgout
, count);
+
count_vm_events(PGPGOUT
, count);
else
else
-
mod_page_state(pgpgin
, count);
+
count_vm_events(PGPGIN
, count);
if (unlikely(block_dump)) {
char b[BDEVNAME_SIZE];
if (unlikely(block_dump)) {
char b[BDEVNAME_SIZE];
@@
-3403,7
+3402,7
@@
static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
}
}
-static struct notifier_block blk_cpu_notifier = {
+static struct notifier_block
__devinitdata
blk_cpu_notifier = {
.notifier_call = blk_cpu_notify,
};
.notifier_call = blk_cpu_notify,
};
@@
-3492,8
+3491,8
@@
EXPORT_SYMBOL(end_request);
void blk_rq_bio_prep(request_queue_t *q, struct request *rq, struct bio *bio)
{
void blk_rq_bio_prep(request_queue_t *q, struct request *rq, struct bio *bio)
{
- /* first t
hree
bits are identical in rq->flags and bio->bi_rw */
- rq->flags |= (bio->bi_rw &
7
);
+ /* first t
wo
bits are identical in rq->flags and bio->bi_rw */
+ rq->flags |= (bio->bi_rw &
3
);
rq->nr_phys_segments = bio_phys_segments(q, bio);
rq->nr_hw_segments = bio_hw_segments(q, bio);
rq->nr_phys_segments = bio_phys_segments(q, bio);
rq->nr_hw_segments = bio_hw_segments(q, bio);
@@
-3541,9
+3540,7
@@
int __init blk_dev_init(void)
INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));
open_softirq(BLOCK_SOFTIRQ, blk_done_softirq, NULL);
-#ifdef CONFIG_HOTPLUG_CPU
- register_cpu_notifier(&blk_cpu_notifier);
-#endif
+ register_hotcpu_notifier(&blk_cpu_notifier);
blk_max_low_pfn = max_low_pfn;
blk_max_pfn = max_pfn;
blk_max_low_pfn = max_low_pfn;
blk_max_pfn = max_pfn;