]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
drm: fix missing inline function on 32-bit powerpc.
authorDave Airlie <airlied@redhat.com>
Tue, 31 Mar 2009 04:14:39 +0000 (15:14 +1100)
committerDave Airlie <airlied@redhat.com>
Thu, 2 Apr 2009 23:07:07 +0000 (09:07 +1000)
The readq/writeq really need to be static inline on the arches which
don't provide them.

Reported-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
include/drm/drm_os_linux.h

index 013551d03c035c984d19e02b692a0ed5b5c3015f..26641e95e0a4be8cb0ce273c88eb65196bfe02af 100644 (file)
@@ -7,12 +7,12 @@
 #include <linux/delay.h>
 
 #ifndef readq
-static u64 readq(void __iomem *reg)
+static inline u64 readq(void __iomem *reg)
 {
        return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);
 }
 
-static void writeq(u64 val, void __iomem *reg)
+static inline void writeq(u64 val, void __iomem *reg)
 {
        writel(val & 0xffffffff, reg);
        writel(val >> 32, reg + 0x4UL);