diff options
author | Glauber Costa <gcosta@redhat.com> | 2008-03-25 17:36:34 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-19 13:19:56 -0400 |
commit | 802c1f6648aeb3eea670b4ef8b10014169b65699 (patch) | |
tree | 7bcb1c348086b01a4ecb4f01b3a910d9c9e2a101 /include/asm-x86/dma-mapping_32.h | |
parent | 3cb6a91711a682adb3aa95da2ed8d47512cc3c41 (diff) |
x86: move dma_supported and dma_set_mask to pci-dma_32.c
This is the way x86_64 does, so this make them equal. They have
to be extern now in the header, and the extern definition is moved to
the common dma-mapping.h header.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/dma-mapping_32.h')
-rw-r--r-- | include/asm-x86/dma-mapping_32.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/include/asm-x86/dma-mapping_32.h b/include/asm-x86/dma-mapping_32.h index e60c30a88311..fd7246dddad4 100644 --- a/include/asm-x86/dma-mapping_32.h +++ b/include/asm-x86/dma-mapping_32.h | |||
@@ -17,35 +17,6 @@ dma_mapping_error(dma_addr_t dma_addr) | |||
17 | extern int forbid_dac; | 17 | extern int forbid_dac; |
18 | 18 | ||
19 | static inline int | 19 | static inline int |
20 | dma_supported(struct device *dev, u64 mask) | ||
21 | { | ||
22 | /* | ||
23 | * we fall back to GFP_DMA when the mask isn't all 1s, | ||
24 | * so we can't guarantee allocations that must be | ||
25 | * within a tighter range than GFP_DMA.. | ||
26 | */ | ||
27 | if(mask < 0x00ffffff) | ||
28 | return 0; | ||
29 | |||
30 | /* Work around chipset bugs */ | ||
31 | if (forbid_dac > 0 && mask > 0xffffffffULL) | ||
32 | return 0; | ||
33 | |||
34 | return 1; | ||
35 | } | ||
36 | |||
37 | static inline int | ||
38 | dma_set_mask(struct device *dev, u64 mask) | ||
39 | { | ||
40 | if(!dev->dma_mask || !dma_supported(dev, mask)) | ||
41 | return -EIO; | ||
42 | |||
43 | *dev->dma_mask = mask; | ||
44 | |||
45 | return 0; | ||
46 | } | ||
47 | |||
48 | static inline int | ||
49 | dma_get_cache_alignment(void) | 20 | dma_get_cache_alignment(void) |
50 | { | 21 | { |
51 | /* no easy way to get cache size on all x86, so return the | 22 | /* no easy way to get cache size on all x86, so return the |