diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/alpha/include/asm/dma-mapping.h | 2 | ||||
-rw-r--r-- | arch/alpha/kernel/pci-noop.c | 3 | ||||
-rw-r--r-- | arch/alpha/kernel/smp.c | 3 |
3 files changed, 6 insertions, 2 deletions
diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h index a5801ae02e4b..04eb5681448c 100644 --- a/arch/alpha/include/asm/dma-mapping.h +++ b/arch/alpha/include/asm/dma-mapping.h | |||
@@ -29,6 +29,8 @@ | |||
29 | 29 | ||
30 | #else /* no PCI - no IOMMU. */ | 30 | #else /* no PCI - no IOMMU. */ |
31 | 31 | ||
32 | #include <asm/io.h> /* for virt_to_phys() */ | ||
33 | |||
32 | struct scatterlist; | 34 | struct scatterlist; |
33 | void *dma_alloc_coherent(struct device *dev, size_t size, | 35 | void *dma_alloc_coherent(struct device *dev, size_t size, |
34 | dma_addr_t *dma_handle, gfp_t gfp); | 36 | dma_addr_t *dma_handle, gfp_t gfp); |
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c index 8ac08311f5a5..c19a376520f4 100644 --- a/arch/alpha/kernel/pci-noop.c +++ b/arch/alpha/kernel/pci-noop.c | |||
@@ -109,7 +109,8 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn, | |||
109 | /* Stubs for the routines in pci_iommu.c: */ | 109 | /* Stubs for the routines in pci_iommu.c: */ |
110 | 110 | ||
111 | void * | 111 | void * |
112 | pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp) | 112 | __pci_alloc_consistent(struct pci_dev *pdev, size_t size, |
113 | dma_addr_t *dma_addrp, gfp_t gfp) | ||
113 | { | 114 | { |
114 | return NULL; | 115 | return NULL; |
115 | } | 116 | } |
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c index d953e510f68d..00f1dc3dfd5f 100644 --- a/arch/alpha/kernel/smp.c +++ b/arch/alpha/kernel/smp.c | |||
@@ -120,8 +120,9 @@ void __cpuinit | |||
120 | smp_callin(void) | 120 | smp_callin(void) |
121 | { | 121 | { |
122 | int cpuid = hard_smp_processor_id(); | 122 | int cpuid = hard_smp_processor_id(); |
123 | cpumask_t mask = cpu_online_map; | ||
123 | 124 | ||
124 | if (cpu_test_and_set(cpuid, cpu_online_map)) { | 125 | if (cpu_test_and_set(cpuid, mask)) { |
125 | printk("??, cpu 0x%x already present??\n", cpuid); | 126 | printk("??, cpu 0x%x already present??\n", cpuid); |
126 | BUG(); | 127 | BUG(); |
127 | } | 128 | } |