Prev: sysfs: add entry to indicate network interfaces with random MAC address
Next: [PATCH] Fix ttm_page_alloc.c build breakage
From: Luck, Tony on 21 Jul 2010 12:50
This commit hit Linus upstream today and broke the ia64 build:

commit 1e8655f87333def92bb8215b423adc65403b08a5
Author: Ben Hutchings <ben(a)decadent.org.uk>
Date: Sun Jul 18 21:51:42 2010 +0100

drm/ttm: Fix build on architectures without AGP

Make inclusion of <asm/agp.h> conditional on TTM_HAS_AGP. The use
of the functions declared in it is already conditional.

Reported-by: Geert Stappers <stappers(a)stappers.nl>
Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk>
Tested-by: Geert Stappers <stappers(a)stappers.nl>
Signed-off-by: Dave Airlie <airlied(a)redhat.com>

diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c
index b1d67dc..1f32b46 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c
@@ -40,7 +40,9 @@
#include <linux/slab.h>

#include <asm/atomic.h>
+#ifdef TTM_HAS_AGP
#include <asm/agp.h>
+#endif

#include "ttm/ttm_bo_driver.h"
#include "ttm/ttm_page_alloc.h"


The problem is that TTM_HAS_AGP is defined in "ttm/ttm_bo_driver.h" ... which
is included *after* you used it to test whether to include <asm/agp.h>

I suspect some re-arrangement is in order :-)

-Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: sysfs: add entry to indicate network interfaces with random MAC address
Next: [PATCH] Fix ttm_page_alloc.c build breakage