ia64/xen-unstable

view patches/linux-2.6.16.29/fix-ide-cd-pio-mode.patch @ 12273:b223ba940ed1

PV-on-HVM: Fix PV-on-HVM drivers need maddr.h included for defn of maddr_t.
Signed-off-by: Takanori Kasai <Kasai.Takanori@jp.fujitsu.com>
Signed-off-by: Tsunehisa Doi <Doi.Tsunehisa@jp.fujitsu.com>
author kfraser@localhost.localdomain
date Tue Nov 07 09:29:53 2006 +0000 (2006-11-07)
parents 041be3f6b38e
children
line source
1 diff -pruN ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c ./drivers/ide/ide-lib.c
2 --- ../orig-linux-2.6.16.29/drivers/ide/ide-lib.c 2006-09-12 19:02:10.000000000 +0100
3 +++ ./drivers/ide/ide-lib.c 2006-09-19 13:59:03.000000000 +0100
4 @@ -410,10 +410,10 @@ void ide_toggle_bounce(ide_drive_t *driv
5 {
6 u64 addr = BLK_BOUNCE_HIGH; /* dma64_addr_t */
8 - if (!PCI_DMA_BUS_IS_PHYS) {
9 - addr = BLK_BOUNCE_ANY;
10 - } else if (on && drive->media == ide_disk) {
11 - if (HWIF(drive)->pci_dev)
12 + if (on && drive->media == ide_disk) {
13 + if (!PCI_DMA_BUS_IS_PHYS)
14 + addr = BLK_BOUNCE_ANY;
15 + else if (HWIF(drive)->pci_dev)
16 addr = HWIF(drive)->pci_dev->dma_mask;
17 }