diff options
| author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2009-01-29 14:25:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 18:04:44 -0800 |
| commit | ee0c468bb151aad23281660152d2894f1e214238 (patch) | |
| tree | 0b839d0e019449077695f04efa421a287bb39f88 /arch/alpha/include | |
| parent | e5d9a90c36e05dd080704ea58328c00f64facdc1 (diff) | |
| download | kernel_samsung_crespo-ee0c468bb151aad23281660152d2894f1e214238.zip kernel_samsung_crespo-ee0c468bb151aad23281660152d2894f1e214238.tar.gz kernel_samsung_crespo-ee0c468bb151aad23281660152d2894f1e214238.tar.bz2 | |
alpha: compile fixes
- jensen build: fix conflicting declarations for pci_alloc_consistent()
and undefined virt_to_phys();
- SMP: arch/alpha/kernel/smp.c:124: warning: passing argument 2
of '__cpu_test_and_set' discards qualifiers from pointer target type
Interestingly, this only happens with gcc-4.2; gcc <= 4.1 and gcc-4.3
are OK. Fixed with extra assignment.
Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/alpha/include')
| -rw-r--r-- | arch/alpha/include/asm/dma-mapping.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h index a5801ae..04eb568 100644 --- a/arch/alpha/include/asm/dma-mapping.h +++ b/arch/alpha/include/asm/dma-mapping.h @@ -29,6 +29,8 @@ #else /* no PCI - no IOMMU. */ +#include <asm/io.h> /* for virt_to_phys() */ + struct scatterlist; void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp); |