Skip to contentSkip to conversation

2.5.69-bk19 drm_memory.h compilation error

PATCH In review Grzegorz Jaskiewicz 2 participants 4 messages May 26, 2003

lore
Share & tools
lore

Grzegorz Jaskiewicz

author
#0 lore raw

PATCH 1/1 2.5.69-bk19 drm_memory.h compilation error

In file included from drivers/char/drm/i810_drv.c:52:
drivers/char/drm/drm_memory.h: In function `drm_ioremapfree':
drivers/char/drm/drm_memory.h:170: error: `PKMAP_BASE' undeclared (first use in this function)
drivers/char/drm/drm_memory.h:170: error: (Each undeclared identifier is reported only once
drivers/char/drm/drm_memory.h:170: error: for each function it appears in.)
make[3]: *** [drivers/char/drm/i810_drv.o] Error 1
make[2]: *** [drivers/char/drm] Error 2
make[1]: *** [drivers/char] Error 2
make: *** [drivers] Error 2

looks like include/asm/highmem.h is not included.

patch below against 2.5.69-bk19
this helps

----------------------------------------------------------
diff -ur 1/drivers/char/drm/drm_memory.h 2/drivers/char/drm/drm_memory.h
--- 1/drivers/char/drm/drm_memory.h 2003-05-26 14:40:31.000000000
+0100
+++ 2/drivers/char/drm/drm_memory.h 2003-05-26 14:42:29.000000000
+0100
@@ -32,6 +32,14 @@
#include <linux/config.h>
#include "drmP.h"

+/*
+ * we need PKMAP_BASE definition
+*/
+
+#ifdef CONFIG_HIGHMEM
+#include <asm/highmem.h>
+#endif
+
/* Cut down version of drm_memory_debug.h, which used to be called
* drm_memory.h. If you want the debug functionality, change 0 to 1
* below.
------------------------------------------------------------------

Signature · 2 lines
Grzegorz Jaskiewicz <[email protected]>
K4 labs
#1 lore raw

Review

Quoted 10 lines · Grzegorz Jaskiewicz

#include <linux/config.h>
#include "drmP.h"

(quoted diff) +7 -0
+/*
+ * we need PKMAP_BASE definition
+*/
+
+#ifdef CONFIG_HIGHMEM
+#include <asm/highmem.h>
+#endif

Just include linux/highmem.h (never the asm version!) uncodintionally amd remove the noisy comment.

author
#2 lore raw
Quoted 2 lines · Christoph Hellwig

Just include linux/highmem.h (never the asm version!) uncodintionally amd remove the noisy comment.

diff -ur 1/drivers/char/drm/drm_memory.h 2/drivers/char/drm/drm_memory.h
--- 1/drivers/char/drm/drm_memory.h 2003-05-26 14:40:31.000000000
+0100
+++ 2/drivers/char/drm/drm_memory.h 2003-05-26 15:28:08.000000000
+0100
@@ -32,6 +32,10 @@
#include <linux/config.h>
#include "drmP.h"

+#ifdef CONFIG_HIGHMEM
+#include <linux/highmem.h>
+#endif
+
/* Cut down version of drm_memory_debug.h, which used to be called
* drm_memory.h. If you want the debug functionality, change 0 to 1
* below.

Signature · 2 lines
Grzegorz Jaskiewicz <[email protected]>
K4 labs
author
#3 lore raw
In reply to Christoph Hellwig

that's better :]

Quoted 3 lines · Christoph Hellwig

Just include linux/highmem.h (never the asm version!) uncodintionally amd remove the noisy comment.

diff -ur 1/drivers/char/drm/drm_memory.h 2/drivers/char/drm/drm_memory.h
--- 1/drivers/char/drm/drm_memory.h 2003-05-26 14:40:31.000000000
+0100
+++ 2/drivers/char/drm/drm_memory.h 2003-05-26 15:41:47.000000000
+0100
@@ -32,6 +32,8 @@
#include <linux/config.h>
#include "drmP.h"

+#include <linux/highmem.h>
+
/* Cut down version of drm_memory_debug.h, which used to be called
* drm_memory.h. If you want the debug functionality, change 0 to 1
* below.

Signature · 2 lines
Grzegorz Jaskiewicz <[email protected]>
K4 labs