From 59be3ca68e503ee97bc3244fdfb5e1cd41f22aeb Mon Sep 17 00:00:00 2001 From: Matti Linnanvuori Date: Sun, 29 Jun 2008 09:22:43 +0300 Subject: [PATCH] --- yaml --- r: 99407 b: refs/heads/master c: ac2564c44509aba1e21d878ffd4f34ac96811762 h: refs/heads/master i: 99405: 1600e68d3993fe9d6c8704242abcc3b630994de8 99403: 93b6808251968de3814a013026b7ac7827917451 99399: 48b7c04bcdf9664ae15dfbe06f0c58d620d062e6 99391: bb77db2b90a020bce5746d2e4c6cefbc41327eec v: v3 --- [refs] | 2 +- trunk/include/asm-x86/pci_32.h | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 28d679d688bb..a3967fd4bd57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1262b0088f3c1928c0487d4074c6cda11a8b78c6 +refs/heads/master: ac2564c44509aba1e21d878ffd4f34ac96811762 diff --git a/trunk/include/asm-x86/pci_32.h b/trunk/include/asm-x86/pci_32.h index 8c4c3a0368e2..a50d46851285 100644 --- a/trunk/include/asm-x86/pci_32.h +++ b/trunk/include/asm-x86/pci_32.h @@ -18,12 +18,14 @@ struct pci_dev; #define PCI_DMA_BUS_IS_PHYS (1) /* pci_unmap_{page,single} is a nop so... */ -#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) -#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) -#define pci_unmap_addr(PTR, ADDR_NAME) (0) -#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) do { } while (0) -#define pci_unmap_len(PTR, LEN_NAME) (0) -#define pci_unmap_len_set(PTR, LEN_NAME, VAL) do { } while (0) +#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) dma_addr_t ADDR_NAME[0]; +#define DECLARE_PCI_UNMAP_LEN(LEN_NAME) unsigned LEN_NAME[0]; +#define pci_unmap_addr(PTR, ADDR_NAME) sizeof((PTR)->ADDR_NAME) +#define pci_unmap_addr_set(PTR, ADDR_NAME, VAL) \ + do { break; } while (pci_unmap_addr(PTR, ADDR_NAME)) +#define pci_unmap_len(PTR, LEN_NAME) sizeof((PTR)->LEN_NAME) +#define pci_unmap_len_set(PTR, LEN_NAME, VAL) \ + do { break; } while (pci_unmap_len(PTR, LEN_NAME)) #endif /* __KERNEL__ */