From: tip-bot for FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
fujita.tomonori@lab.ntt.co.jp, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:core/iommu] swiotlb: Remove duplicate swiotlb_force extern declarations
Date: Sun, 15 Nov 2009 10:28:21 GMT [thread overview]
Message-ID: <tip-6959450e567c1f17d3ce8489099fc56c3721d577@git.kernel.org> (raw)
In-Reply-To: <1258199198-16657-4-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Commit-ID: 6959450e567c1f17d3ce8489099fc56c3721d577
Gitweb: http://git.kernel.org/tip/6959450e567c1f17d3ce8489099fc56c3721d577
Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
AuthorDate: Sat, 14 Nov 2009 20:46:38 +0900
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 15 Nov 2009 09:03:10 +0100
swiotlb: Remove duplicate swiotlb_force extern declarations
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: tony.luck@intel.com
LKML-Reference: <1258199198-16657-4-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/ia64/include/asm/swiotlb.h | 2 --
arch/x86/include/asm/swiotlb.h | 4 ----
include/linux/swiotlb.h | 2 ++
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/arch/ia64/include/asm/swiotlb.h b/arch/ia64/include/asm/swiotlb.h
index dcbaea7..f0acde6 100644
--- a/arch/ia64/include/asm/swiotlb.h
+++ b/arch/ia64/include/asm/swiotlb.h
@@ -4,8 +4,6 @@
#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
-extern int swiotlb_force;
-
#ifdef CONFIG_SWIOTLB
extern int swiotlb;
extern void pci_swiotlb_init(void);
diff --git a/arch/x86/include/asm/swiotlb.h b/arch/x86/include/asm/swiotlb.h
index 940f13a..87ffcb1 100644
--- a/arch/x86/include/asm/swiotlb.h
+++ b/arch/x86/include/asm/swiotlb.h
@@ -3,10 +3,6 @@
#include <linux/swiotlb.h>
-/* SWIOTLB interface */
-
-extern int swiotlb_force;
-
#ifdef CONFIG_SWIOTLB
extern int swiotlb;
extern int pci_swiotlb_init(void);
diff --git a/include/linux/swiotlb.h b/include/linux/swiotlb.h
index eb9bdb4..febedcf 100644
--- a/include/linux/swiotlb.h
+++ b/include/linux/swiotlb.h
@@ -7,6 +7,8 @@ struct device;
struct dma_attrs;
struct scatterlist;
+extern int swiotlb_force;
+
/*
* Maximum allowable number of contiguous slabs to map,
* must be a power of 2. What is the appropriate value ?
next prev parent reply other threads:[~2009-11-15 10:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-14 11:46 [PATCH 0/3] IOMMU initialization cleanups FUJITA Tomonori
2009-11-14 11:46 ` [PATCH 1/3] x86: set dma_ops to nommu_dma_ops by default FUJITA Tomonori
2009-11-15 10:27 ` [tip:core/iommu] x86: Set " tip-bot for FUJITA Tomonori
2009-11-14 11:46 ` [PATCH 2/3] x86: move iommu_shutdown_noop to x86_init.c FUJITA Tomonori
2009-11-15 10:28 ` [tip:core/iommu] x86: Move " tip-bot for FUJITA Tomonori
2009-11-14 11:46 ` [PATCH 3/3] remove duplicate extern declarations for swiotlb_force FUJITA Tomonori
2009-11-15 10:28 ` tip-bot for FUJITA Tomonori [this message]
2009-11-15 9:01 ` [PATCH 0/3] IOMMU initialization cleanups Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-6959450e567c1f17d3ce8489099fc56c3721d577@git.kernel.org \
--to=fujita.tomonori@lab.ntt.co.jp \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox