direct-io.hg

changeset 12234:d6795f951c42

[LINUX] Clean up header includes (gnttab.h from fixmap.h).

include/asm-{i386,x86_64}/mach-xen/asm/fixmap.h was needlessly
including include/xen/gnttab.h. Removing this made necessary explicit
inclusion of that header in tpm_xen.c, the build of which should not
have succeeded on non-x86 architectures before.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Fri Nov 03 12:10:02 2006 +0000 (2006-11-03)
parents f1e7799750dc
children b21ff7716f87
files linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Fri Nov 03 12:08:42 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Fri Nov 03 12:10:02 2006 +0000
     1.3 @@ -41,6 +41,7 @@
     1.4  #include <xen/evtchn.h>
     1.5  #include <xen/interface/grant_table.h>
     1.6  #include <xen/interface/io/tpmif.h>
     1.7 +#include <xen/gnttab.h>
     1.8  #include <xen/xenbus.h>
     1.9  #include "tpm.h"
    1.10  #include "tpm_vtpm.h"
     2.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h	Fri Nov 03 12:08:42 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/fixmap.h	Fri Nov 03 12:10:02 2006 +0000
     2.3 @@ -27,7 +27,6 @@ extern unsigned long __FIXADDR_TOP;
     2.4  #include <asm/acpi.h>
     2.5  #include <asm/apicdef.h>
     2.6  #include <asm/page.h>
     2.7 -#include <xen/gnttab.h>
     2.8  #ifdef CONFIG_HIGHMEM
     2.9  #include <linux/threads.h>
    2.10  #include <asm/kmap_types.h>
     3.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h	Fri Nov 03 12:08:42 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/fixmap.h	Fri Nov 03 12:10:02 2006 +0000
     3.3 @@ -14,7 +14,6 @@
     3.4  #include <linux/config.h>
     3.5  #include <linux/kernel.h>
     3.6  #include <asm/apicdef.h>
     3.7 -#include <xen/gnttab.h>
     3.8  #include <asm/page.h>
     3.9  #include <asm/vsyscall.h>
    3.10  #include <asm/vsyscall32.h>