Merge branch 'linus' into core/percpu

Conflicts:
	kernel/irq/handle.c

2 files changed, 8 insertions, 11 deletions

diff --git a/arch/alpha/include/asm/bug.h b/arch/alpha/include/asm/bug.h
index 695a5ee4b5d3..7b85b7c93709 100644
--- a/arch/alpha/include/asm/bug.h
+++ b/arch/alpha/include/asm/bug.h
@@ -8,17 +8,12 @@
 
 /* ??? Would be nice to use .gprel32 here, but we can't be sure that the
    function loaded the GP, so this could fail in modules.  */
-static inline void ATTRIB_NORET __BUG(const char *file, int line)
-{
-        __asm__ __volatile__(
-                "call_pal %0  # bugchk\n\t"
-                ".long %1\n\t.8byte %2"
-                       : : "i" (PAL_bugchk), "i"(line), "i"(file));
-        for ( ; ; )
-                ;
-}
-
-#define BUG() __BUG(__FILE__, __LINE__)
+#define BUG()   {                                                       \
+        __asm__ __volatile__(                                           \
+                "call_pal %0  # bugchk\n\t"                             \
+                ".long %1\n\t.8byte %2"                                 \
+                : : "i"(PAL_bugchk), "i"(__LINE__), "i"(__FILE__));     \
+        for ( ; ; ); }
 
 #define HAVE_ARCH_BUG
 #endif
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 @@
 
 #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);