alpha: compile fixes
authorIvan Kokshaysky <ink@jurassic.park.msu.ru>
Thu, 29 Jan 2009 22:25:19 +0000 (14:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 30 Jan 2009 02:04:44 +0000 (18:04 -0800)
- 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>
arch/alpha/include/asm/dma-mapping.h
arch/alpha/kernel/pci-noop.c
arch/alpha/kernel/smp.c

index a5801ae02e4be31cb7232626b6f6468a9495244e..04eb5681448c8ade147b71296531488bd56c93f6 100644 (file)
@@ -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);
index 8ac08311f5a51bd765145b461b76864f550d38f1..c19a376520f45e3d3b89c6d749117a77727443f0 100644 (file)
@@ -109,7 +109,8 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn,
 /* Stubs for the routines in pci_iommu.c: */
 
 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;
 }
index d953e510f68d71ff417206e98c76dc9c13be45ad..00f1dc3dfd5f215e5e1068c89c2376afed7f7830 100644 (file)
@@ -120,8 +120,9 @@ void __cpuinit
 smp_callin(void)
 {
        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);
                BUG();
        }