Re: linux-next: build failure after merge of the pci-current tree

[Stephen Rothwell]

Hi Jesse,

On Thu, 3 Nov 2011 12:53:25 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> After merging the pci-current tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/pci/ats.c:13:26: fatal error: linux/export.h: No such file or directory
> 
> Caused by commit 571eba1b8aa9 ("PCI: Fix compile errors with PCI_ATS and !
> PCI_IOV").

I have added that patch as a merge fix where I merge the module.h split
up tree.  (Included below for Paul's benefit.)

From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Date: Mon, 31 Oct 2011 10:31:01 -0700
Subject: [PATCH] PCI: Fix compile errors with PCI_ATS and !PCI_IOV

For linux-next (where the module-split tree is being worked),
drivers/pci/ats.c also needs to include <linux/export.h> to fix build
warnings:

drivers/pci/ats.c:96:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
drivers/pci/ats.c:127:1: warning: type defaults to 'int' in declaration of 'EXPORT_SYMBOL_GPL'
etc.

Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Jesse Barnes <jbarnes@xxxxxxxxxxxxxxxx>
---
 drivers/pci/ats.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/ats.c b/drivers/pci/ats.c
index f727a09..7ec56fb 100644
--- a/drivers/pci/ats.c
+++ b/drivers/pci/ats.c
@@ -10,6 +10,7 @@
  *   PASID support added by Joerg Roedel <joerg.roedel@xxxxxxx>
  */
 
+#include <linux/export.h>
 #include <linux/pci-ats.h>
 #include <linux/pci.h>
 
-- 
1.7.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature