summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-03-31 15:14:39 +1100
committerDave Airlie <airlied@redhat.com>2009-04-03 09:07:07 +1000
commit522b5cc7cec124e06629c0702ffab1307416aec7 (patch)
treef21f0419f1efd1c2269402a4a9a0f30e39b6b78b /include
parent833bb3046b6cb320e775ea2160ddca87d53260d5 (diff)
downloadblackbird-op-linux-522b5cc7cec124e06629c0702ffab1307416aec7.tar.gz
blackbird-op-linux-522b5cc7cec124e06629c0702ffab1307416aec7.zip
drm: fix missing inline function on 32-bit powerpc.
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>
Diffstat (limited to 'include')
-rw-r--r--include/drm/drm_os_linux.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/drm/drm_os_linux.h b/include/drm/drm_os_linux.h
index 013551d03c03..26641e95e0a4 100644
--- a/include/drm/drm_os_linux.h
+++ b/include/drm/drm_os_linux.h
@@ -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);
OpenPOWER on IntegriCloud