From 78f389dd9fe461e7f9b5b40c4f5b2ea7f854a5df Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 23 Jun 2009 10:39:36 -0700 Subject: [PATCH] --- yaml --- r: 153900 b: refs/heads/master c: 811e42cfba334d27797989ac8b0bea4981cb9581 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 6 +++--- trunk/drivers/ide/cmd64x.c | 3 +-- trunk/mm/vmscan.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2effe008a025..c2ad833ed10e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d9e6659a1bde3733cfd0072adbb3514b579e383 +refs/heads/master: 811e42cfba334d27797989ac8b0bea4981cb9581 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 02f6f78b561f..5ef3a16eb140 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2824,10 +2824,10 @@ S: Supported F: drivers/scsi/ips.* IDE SUBSYSTEM -P: Bartlomiej Zolnierkiewicz -M: bzolnier@gmail.com +P: David S. Miller +M: davem@davemloft.net L: linux-ide@vger.kernel.org -T: git git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git S: Maintained F: Documentation/ide/ F: drivers/ide/ diff --git a/trunk/drivers/ide/cmd64x.c b/trunk/drivers/ide/cmd64x.c index 03c86209446f..680e5975217f 100644 --- a/trunk/drivers/ide/cmd64x.c +++ b/trunk/drivers/ide/cmd64x.c @@ -389,8 +389,7 @@ static const struct ide_port_info cmd64x_chipsets[] __devinitdata = { .init_chipset = init_chipset_cmd64x, .enablebits = {{0x51,0x04,0x04}, {0x51,0x08,0x08}}, .port_ops = &cmd648_port_ops, - .host_flags = IDE_HFLAG_SERIALIZE | - IDE_HFLAG_ABUSE_PREFETCH, + .host_flags = IDE_HFLAG_ABUSE_PREFETCH, .pio_mask = ATA_PIO5, .mwdma_mask = ATA_MWDMA2, .udma_mask = ATA_UDMA2, diff --git a/trunk/mm/vmscan.c b/trunk/mm/vmscan.c index e8fa2d9eb212..54155268dfca 100644 --- a/trunk/mm/vmscan.c +++ b/trunk/mm/vmscan.c @@ -932,7 +932,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, continue; if (__isolate_lru_page(cursor_page, mode, file) == 0) { list_move(&cursor_page->lru, dst); - mem_cgroup_del_lru(page); + mem_cgroup_del_lru(cursor_page); nr_taken++; scan++; }