From e9c9963b439db734e9705f96909c5a3388dd81bb Mon Sep 17 00:00:00 2001
From: Jonathan Corbet <corbet@lwn.net>
Date: Thu, 6 Aug 2015 12:44:23 -0600
Subject: [PATCH] Revert "DocBook: Avoid building man pages repeatedly and
 inconsistently"

This reverts commit b44158b17099ed5c7c8f4bfb7029942adbfbc318.  This commit
introduced warnings and possibly inconsistent results into the doc build
process.  The goal is good but it will need to be achieved another way.

Reported-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 Documentation/DocBook/Makefile            | 10 +---------
 Documentation/DocBook/device-drivers.tmpl |  6 ------
 Documentation/DocBook/gadget.tmpl         |  3 ---
 Documentation/DocBook/kernel-api.tmpl     |  6 ------
 4 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 83fcb6c2a00f..11a41456b943 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -56,13 +56,6 @@ htmldocs: $(HTML)
 
 MAN := $(patsubst %.xml, %.9, $(BOOKS))
 mandocs: $(MAN)
-	@dups=$$(sed -n 's/.*<refname>\([^<]*\)<\/refname>.*/\1/p'	\
-		 $(obj)/*.xml.noextra | sort | uniq -d);		\
-	if [ -n "$$dups" ]; then					\
-		echo >&2 "The following manual pages are generated more than once:"; \
-		printf >&2 '%s\n' "$$dups";				\
-		exit 1;							\
-	fi
 	find $(obj)/man -name '*.9' | xargs gzip -nf
 
 installmandocs: mandocs
@@ -157,7 +150,7 @@ quiet_cmd_db2html = HTML    $@
             cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
 
 quiet_cmd_db2man = MAN     $@
-      cmd_db2man = if grep -q refentry $<; then xmlif excludeextra=1 <$< >$<.noextra && xmlto man $(XMLTOFLAGS) -o $(obj)/man $<.noextra ; fi
+      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; fi
 %.9 : %.xml
 	@(which xmlto > /dev/null 2>&1) || \
 	 (echo "*** You need to install xmlto ***"; \
@@ -224,7 +217,6 @@ clean-files := $(DOCBOOKS) \
 	$(patsubst %.xml, %.ps,   $(DOCBOOKS)) \
 	$(patsubst %.xml, %.pdf,  $(DOCBOOKS)) \
 	$(patsubst %.xml, %.html, $(DOCBOOKS)) \
-	$(patsubst %, %.noextra,  $(DOCBOOKS)) \
 	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \
 	$(index)
 
diff --git a/Documentation/DocBook/device-drivers.tmpl b/Documentation/DocBook/device-drivers.tmpl
index 87853ea1f70b..faf09d4a0ea8 100644
--- a/Documentation/DocBook/device-drivers.tmpl
+++ b/Documentation/DocBook/device-drivers.tmpl
@@ -194,13 +194,8 @@ X!Edrivers/pnp/system.c
 
   <chapter id="snddev">
      <title>Sound Devices</title>
-<?xmlif if excludeextra='1'?>
-<?xmlif else?>
 !Iinclude/sound/core.h
-<?xmlif fi?>
 !Esound/sound_core.c
-<?xmlif if excludeextra='1'?>
-<?xmlif else?>
 !Iinclude/sound/pcm.h
 !Esound/core/pcm.c
 !Esound/core/device.c
@@ -216,7 +211,6 @@ X!Edrivers/pnp/system.c
 !Esound/core/hwdep.c
 !Esound/core/pcm_native.c
 !Esound/core/memalloc.c
-<?xmlif fi?>
 <!-- FIXME: Removed for now since no structured comments in source
 X!Isound/sound_firmware.c
 -->
diff --git a/Documentation/DocBook/gadget.tmpl b/Documentation/DocBook/gadget.tmpl
index e1b87bd63f82..641629221176 100644
--- a/Documentation/DocBook/gadget.tmpl
+++ b/Documentation/DocBook/gadget.tmpl
@@ -488,10 +488,7 @@ These are the same types and constants used by host
 side drivers (and usbcore).
 </para>
 
-<?xmlif if excludeextra='1'?>
-<?xmlif else?>
 !Iinclude/linux/usb/ch9.h
-<?xmlif fi?>
 </sect1>
 
 <sect1 id="core"><title>Core Objects and Methods</title>
diff --git a/Documentation/DocBook/kernel-api.tmpl b/Documentation/DocBook/kernel-api.tmpl
index 722249a0dbfe..ecfd0ea40661 100644
--- a/Documentation/DocBook/kernel-api.tmpl
+++ b/Documentation/DocBook/kernel-api.tmpl
@@ -58,11 +58,8 @@
 
      <sect1><title>String Conversions</title>
 !Elib/vsprintf.c
-<?xmlif if excludeextra='1'?>
-<?xmlif else?>
 !Finclude/linux/kernel.h kstrtol
 !Finclude/linux/kernel.h kstrtoul
-<?xmlif fi?>
 !Elib/kstrtox.c
      </sect1>
      <sect1><title>String Manipulation</title>
@@ -181,10 +178,7 @@ X!Ekernel/module.c
   <chapter id="hardware">
      <title>Hardware Interfaces</title>
      <sect1><title>Interrupt Handling</title>
-<?xmlif if excludeextra='1'?>
-<?xmlif else?>
 !Ekernel/irq/manage.c
-<?xmlif fi?>
      </sect1>
 
      <sect1><title>DMA Channels</title>