Browse Source

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>
Ivan Kokshaysky 16 years ago
parent
commit
ee0c468bb1
3 changed files with 6 additions and 2 deletions
  1. 2 0
      arch/alpha/include/asm/dma-mapping.h
  2. 2 1
      arch/alpha/kernel/pci-noop.c
  3. 2 1
      arch/alpha/kernel/smp.c

+ 2 - 0
arch/alpha/include/asm/dma-mapping.h

@@ -29,6 +29,8 @@
 
 
 #else	/* no PCI - no IOMMU. */
 #else	/* no PCI - no IOMMU. */
 
 
+#include <asm/io.h>	/* for virt_to_phys() */
+
 struct scatterlist;
 struct scatterlist;
 void *dma_alloc_coherent(struct device *dev, size_t size,
 void *dma_alloc_coherent(struct device *dev, size_t size,
 			 dma_addr_t *dma_handle, gfp_t gfp);
 			 dma_addr_t *dma_handle, gfp_t gfp);

+ 2 - 1
arch/alpha/kernel/pci-noop.c

@@ -109,7 +109,8 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn,
 /* Stubs for the routines in pci_iommu.c: */
 /* Stubs for the routines in pci_iommu.c: */
 
 
 void *
 void *
-pci_alloc_consistent(struct pci_dev *pdev, size_t size, dma_addr_t *dma_addrp)
+__pci_alloc_consistent(struct pci_dev *pdev, size_t size,
+		       dma_addr_t *dma_addrp, gfp_t gfp)
 {
 {
 	return NULL;
 	return NULL;
 }
 }

+ 2 - 1
arch/alpha/kernel/smp.c

@@ -120,8 +120,9 @@ void __cpuinit
 smp_callin(void)
 smp_callin(void)
 {
 {
 	int cpuid = hard_smp_processor_id();
 	int cpuid = hard_smp_processor_id();
+	cpumask_t mask = cpu_online_map;
 
 
-	if (cpu_test_and_set(cpuid, cpu_online_map)) {
+	if (cpu_test_and_set(cpuid, mask)) {
 		printk("??, cpu 0x%x already present??\n", cpuid);
 		printk("??, cpu 0x%x already present??\n", cpuid);
 		BUG();
 		BUG();
 	}
 	}