diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-13 22:01:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-03-13 22:01:38 -0800 |
| commit | da5ca9a5d6655bd52820347fe6d912292b1177a1 (patch) | |
| tree | e6d9d4ee8f8f7ab99385e51cccb1981c1a89ec95 /include/linux | |
| parent | aeb08fc02401ccd8fa897165434a9a0d22095b36 (diff) | |
| parent | 157cc3eed93704eb94443b25e0e5d975ea562879 (diff) | |
Merge http://nfsclient.bkbits.net/linux-2.5
into ppc970.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/device.h | 6 | ||||
| -rw-r--r-- | include/linux/page-flags.h | 3 | ||||
| -rw-r--r-- | include/linux/pci.h | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index aef6b2f8836e..28e101a77070 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -285,6 +285,12 @@ struct device { detached from its driver. */ u64 *dma_mask; /* dma mask (if dma'able device) */ + u64 coherent_dma_mask;/* Like dma_mask, but for + alloc_coherent mappings as + not all hardware supports + 64 bit addresses for consistent + allocations such descriptors. */ + struct list_head dma_pools; /* dma pools (if dma'ble) */ void (*release)(struct device * dev); diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index f58c9e68d3d8..b8b743c3a951 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -80,6 +80,9 @@ /* * Global page accounting. One instance per CPU. Only unsigned longs are * allowed. + * + * NOTE: if this structure is changed then mm/page_alloc.c and + * arch/s390/appldata/appldata_mem.c must be updated accordingly */ struct page_state { unsigned long nr_dirty; /* Dirty writeable pages */ diff --git a/include/linux/pci.h b/include/linux/pci.h index eb594a816bec..3f2b4949a65e 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -393,11 +393,6 @@ struct pci_dev { this if your device has broken DMA or supports 64-bit transfers. */ - u64 consistent_dma_mask;/* Like dma_mask, but for - pci_alloc_consistent mappings as - not all hardware supports - 64 bit addresses for consistent - allocations such descriptors. */ u32 current_state; /* Current operating state. In ACPI-speak, this is D0-D3, D0 being fully functional, and D3 being off. */ |