linux-kernel - [tip:x86/doc] x86, docbook: Fix errors from x86 headers merger

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>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-372e22ef0a87d5fc10d387791f9f19721115820c@git.kernel.org>
Date:	Tue, 2 Mar 2010 07:15:41 GMT
From:	tip-bot for Randy Dunlap <randy.dunlap@...cle.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	brgerst@...il.com, tglx@...utronix.de, randy.dunlap@...cle.com
Subject: [tip:x86/doc] x86, docbook: Fix errors from x86 headers merger

Commit-ID:  372e22ef0a87d5fc10d387791f9f19721115820c
Gitweb:     http://git.kernel.org/tip/372e22ef0a87d5fc10d387791f9f19721115820c
Author:     Randy Dunlap <randy.dunlap@...cle.com>
AuthorDate: Mon, 1 Mar 2010 22:06:25 -0800
Committer:  H. Peter Anvin <hpa@...or.com>
CommitDate: Mon, 1 Mar 2010 23:14:33 -0800

x86, docbook: Fix errors from x86 headers merger

Fix docbook errors for x86 headers that were recently merged:

docproc: arch/x86/include/asm/atomic_32.h: No such file or directory
docproc: arch/x86/include/asm/io_32.h: No such file or directory

Signed-off-by: Randy Dunlap <randy.dunlap@...cle.com>
LKML-Reference: <20100301220625.bad46c19.randy.dunlap@...cle.com>
Cc: Brian Gerst <brgerst@...il.com>
Signed-off-by: H. Peter Anvin <hpa@...or.com>
---
 Documentation/DocBook/device-drivers.tmpl |    2 +-
 Documentation/DocBook/deviceiobook.tmpl   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index f9a6e2c..1b2dd4f 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -45,7 +45,7 @@
      </sect1>
 
      <sect1><title>Atomic and pointer manipulation</title>
-!Iarch/x86/include/asm/atomic_32.h
+!Iarch/x86/include/asm/atomic.h
 !Iarch/x86/include/asm/unaligned.h
      </sect1>
 
diff --git a/Documentation/DocBook/deviceiobook.tmpl b/Documentation/DocBook/deviceiobook.tmpl
index 3ed8812..c1ed6a4 100644
--- a/Documentation/DocBook/deviceiobook.tmpl
+++ b/Documentation/DocBook/deviceiobook.tmpl
@@ -316,7 +316,7 @@ CPU B:  spin_unlock_irqrestore(&amp;dev_lock, flags)
 
   <chapter id="pubfunctions">
      <title>Public Functions Provided</title>
-!Iarch/x86/include/asm/io_32.h
+!Iarch/x86/include/asm/io.h
 !Elib/iomap.c
   </chapter>
 
--
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/