mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Adrian Bunk <bunk@stusta.de>
To: Andrew Morton <akpm@osdl.org>
Cc: ak@suse.de, discuss@x86-64.org, linux-kernel@vger.kernel.org,
	Jon Mason <jdmason@us.ibm.com>
Subject: [2.6 patch] x86-64: fix double definition of force_iommu
Date: Mon, 13 Mar 2006 23:01:20 +0100	[thread overview]
Message-ID: <20060313220120.GN13973@stusta.de> (raw)

From: Jon Mason <jdmason@us.ibm.com>

This fixes a double definition of force_iommu, and moves no_iommu to be
with the rest of the IOMMU variables.

Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>

---

This patch was sent by Jon Mason on:
- 28 Feb 2006

--- a/include/asm-x86_64/proto.h	Tue Feb 28 22:02:10 2006
+++ b/include/asm-x86_64/proto.h	Tue Feb 28 18:40:04 2006
@@ -109,7 +109,6 @@
 extern unsigned long table_start, table_end;
 
 extern int exception_trace;
-extern int force_iommu, no_iommu;
 extern int using_apic_timer;
 extern int disable_apic;
 extern unsigned cpu_khz;
@@ -130,6 +129,7 @@
 #define iommu_aperture_allowed 0
 #endif
 extern int force_iommu;
+extern int no_iommu;
 
 extern int reboot_force;
 extern int notsc_setup(char *);

                 reply	other threads:[~2006-03-13 22:01 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20060313220120.GN13973@stusta.de \
    --to=bunk@stusta.de \
    --cc=ak@suse.de \
    --cc=akpm@osdl.org \
    --cc=discuss@x86-64.org \
    --cc=jdmason@us.ibm.com \
    --cc=linux-kernel@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®