diff options
author | Ivan Kokshaysky <ink@jurassic.park.msu.ru> | 2009-01-29 17:25:19 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-29 21:04:44 -0500 |
commit | ee0c468bb151aad23281660152d2894f1e214238 (patch) | |
tree | 0b839d0e019449077695f04efa421a287bb39f88 /arch/alpha/kernel/pci-noop.c | |
parent | e5d9a90c36e05dd080704ea58328c00f64facdc1 (diff) |
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/kernel/pci-noop.c')
-rw-r--r-- | arch/alpha/kernel/pci-noop.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 | } |