Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3be4bb06 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes'

parents 85d6162d 7bdd7208

CREDITS

+1 −1
Original line number Diff line number Diff line
@@ -1097,7 +1097,7 @@ S: 80050-430 - Curitiba - Paran 
S: Brazil



N: Kumar Gala

E: kumar.gala@freescale.com

E: galak@kernel.crashing.org

D: Embedded PowerPC 6xx/7xx/74xx/82xx/83xx/85xx support

S: Austin, Texas 78729

S: USA

Documentation/DocBook/Makefile

+33 −15
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \ 
#                        +--> DIR=file  (htmldocs)

#                        +--> man/      (mandocs)





# for PDF and PS output you can choose between xmlto and docbook-utils tools

PDF_METHOD	= $(prefer-db2x)

PS_METHOD	= $(prefer-db2x)





###

# The targets that may be used.

.PHONY:	xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs
@@ -93,27 +99,39 @@ C-procfs-example = procfs_example.xml 
C-procfs-example2 = $(addprefix $(obj)/,$(C-procfs-example))

$(obj)/procfs-guide.xml: $(C-procfs-example2)



###

# Rules to generate postscript, PDF and HTML

# db2html creates a directory. Generate a html file used for timestamp

notfoundtemplate = echo "*** You have to install docbook-utils or xmlto ***"; \

		   exit 1

db2xtemplate = db2TYPE -o $(dir $@) $<

xmltotemplate = xmlto TYPE $(XMLTOFLAGS) -o $(dir $@) $<



# determine which methods are available

ifeq ($(shell which db2ps >/dev/null 2>&1 && echo found),found)

	use-db2x = db2x

	prefer-db2x = db2x

else

	use-db2x = notfound

	prefer-db2x = $(use-xmlto)

endif

ifeq ($(shell which xmlto >/dev/null 2>&1 && echo found),found)

	use-xmlto = xmlto

	prefer-xmlto = xmlto

else

	use-xmlto = notfound

	prefer-xmlto = $(use-db2x)

endif



quiet_cmd_db2ps = XMLTO    $@

      cmd_db2ps = xmlto ps $(XMLTOFLAGS) -o $(dir $@) $<

# the commands, generated from the chosen template

quiet_cmd_db2ps = PS      $@

      cmd_db2ps = $(subst TYPE,ps, $($(PS_METHOD)template))

%.ps : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	  exit 1)

	$(call cmd,db2ps)



quiet_cmd_db2pdf = XMLTO   $@

      cmd_db2pdf = xmlto pdf $(XMLTOFLAGS) -o $(dir $@) $<

quiet_cmd_db2pdf = PDF      $@

      cmd_db2pdf = $(subst TYPE,pdf, $($(PDF_METHOD)template))

%.pdf : %.xml

	@(which xmlto > /dev/null 2>&1) || \

	 (echo "*** You need to install xmlto ***"; \

	  exit 1)

	$(call cmd,db2pdf)



quiet_cmd_db2html = XMLTO  $@

quiet_cmd_db2html = HTML   $@

      cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \

		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \

         Goto $(patsubst %.html,%,$(notdir $@))</a><p>' > $@
@@ -127,7 +145,7 @@ quiet_cmd_db2html = XMLTO $@ 
	@if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \

            cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi



quiet_cmd_db2man = XMLTO   $@

quiet_cmd_db2man = MAN     $@

      cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi

%.9 : %.xml

	@(which xmlto > /dev/null 2>&1) || \

Documentation/DocBook/kernel-api.tmpl

+2 −4
Original line number Diff line number Diff line
@@ -68,9 +68,7 @@ X!Iinclude/linux/kobject.h 


     <sect1><title>Kernel utility functions</title>

!Iinclude/linux/kernel.h

<!-- This needs to clean up to make kernel-doc happy

X!Ekernel/printk.c

 -->

!Ekernel/printk.c

!Ekernel/panic.c

!Ekernel/sys.c

!Ekernel/rcupdate.c
@@ -388,7 +386,7 @@ X!Edrivers/pnp/system.c 


  <chapter id="blkdev">

     <title>Block Devices</title>

!Edrivers/block/ll_rw_blk.c

!Eblock/ll_rw_blk.c

  </chapter>



  <chapter id="miscdev">

Documentation/DocBook/stylesheet.xsl

+1 −0
Original line number Diff line number Diff line
@@ -3,4 +3,5 @@ 
<param name="chunk.quietly">1</param>

<param name="funcsynopsis.style">ansi</param>

<param name="funcsynopsis.tabular.threshold">80</param>

<!-- <param name="paper.type">A4</param> -->

</stylesheet>

Documentation/atomic_ops.txt

+27 −0
Original line number Diff line number Diff line
@@ -115,6 +115,33 @@ boolean is return which indicates whether the resulting counter value 
is negative.  It requires explicit memory barrier semantics around the

operation.



Then:



	int atomic_cmpxchg(atomic_t *v, int old, int new);



This performs an atomic compare exchange operation on the atomic value v,

with the given old and new values. Like all atomic_xxx operations,

atomic_cmpxchg will only satisfy its atomicity semantics as long as all

other accesses of *v are performed through atomic_xxx operations.



atomic_cmpxchg requires explicit memory barriers around the operation.



The semantics for atomic_cmpxchg are the same as those defined for 'cas'

below.



Finally:



	int atomic_add_unless(atomic_t *v, int a, int u);



If the atomic value v is not equal to u, this function adds a to v, and

returns non zero. If v is equal to u then it returns zero. This is done as

an atomic operation.



atomic_add_unless requires explicit memory barriers around the operation.



atomic_inc_not_zero, equivalent to atomic_add_unless(v, 1, 0)





If a caller requires memory barrier semantics around an atomic_t

operation which does not return a value, a set of interfaces are

defined which accomplish this: