aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-03-31 00:14:39 -0400
committerDave Airlie <airlied@redhat.com>2009-04-02 19:07:07 -0400
commit522b5cc7cec124e06629c0702ffab1307416aec7 (patch)
treef21f0419f1efd1c2269402a4a9a0f30e39b6b78b
parent833bb3046b6cb320e775ea2160ddca87d53260d5 (diff)
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>
-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 @@
7#include <linux/delay.h> 7#include <linux/delay.h>
8 8
9#ifndef readq 9#ifndef readq
10static u64 readq(void __iomem *reg) 10static inline u64 readq(void __iomem *reg)
11{ 11{
12 return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32); 12 return ((u64) readl(reg)) | (((u64) readl(reg + 4UL)) << 32);
13} 13}
14 14
15static void writeq(u64 val, void __iomem *reg) 15static inline void writeq(u64 val, void __iomem *reg)
16{ 16{
17 writel(val & 0xffffffff, reg); 17 writel(val & 0xffffffff, reg);
18 writel(val >> 32, reg + 0x4UL); 18 writel(val >> 32, reg + 0x4UL);