linux-kernel - [git pull] ia64 changes

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <4c47231922590620a5@agluck-desktop.sc.intel.com>
Date:	Wed, 21 Jul 2010 09:40:57 -0700
From:	"Luck, Tony" <tony.luck@...el.com>
To:	"Ben Hutchings" <ben@...adent.org.uk>
Cc:	linux-kernel@...r.kernel.org,
	"Geert Stappers" <stappers@...ppers.nl>,
	"Dave Airlie" <airlied@...hat.com>
Subject: [git pull] ia64 changes

This commit hit Linus upstream today and broke the ia64 build:

commit 1e8655f87333def92bb8215b423adc65403b08a5
Author: Ben Hutchings <ben@...adent.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@...ppers.nl>
    Signed-off-by: Ben Hutchings <ben@...adent.org.uk>
    Tested-by: Geert Stappers <stappers@...ppers.nl>
    Signed-off-by: Dave Airlie <airlied@...hat.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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/