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

Commit c7a441bb authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/hda' into for-linus

parents ead54d87 e4caa8ba

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ modules.builtin 
*.gz

*.bz2

*.lzma

*.lzo

*.patch

*.gcno

Documentation/.gitignore

0 → 100644
+7 −0
Original line number Diff line number Diff line 
filesystems/dnotify_test

laptops/dslm

timers/hpet_example

vm/hugepage-mmap

vm/hugepage-shm

vm/map_hugetlb

Documentation/kbuild/kbuild.txt

+5 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ CROSS_COMPILE 
Specify an optional fixed part of the binutils filename.

CROSS_COMPILE can be a part of the filename or the full path.



CROSS_COMPILE is also used for ccache is some setups.

CROSS_COMPILE is also used for ccache in some setups.



CF

--------------------------------------------------
@@ -162,3 +162,7 @@ For tags/TAGS/cscope targets, you can specify more than one arch 
to be included in the databases, separated by blank space. E.g.:



    $ make ALLSOURCE_ARCHS="x86 mips arm" tags



To get all available archs you can also specify all. E.g.:



    $ make ALLSOURCE_ARCHS=all tags

Documentation/mutex-design.txt

+2 −2
Original line number Diff line number Diff line
@@ -66,14 +66,14 @@ of advantages of mutexes: 


    c0377ccb <mutex_lock>:

    c0377ccb:       f0 ff 08                lock decl (%eax)

    c0377cce:       78 0e                   js     c0377cde <.text.lock.mutex>

    c0377cce:       78 0e                   js     c0377cde <.text..lock.mutex>

    c0377cd0:       c3                      ret



   the unlocking fastpath is equally tight:



    c0377cd1 <mutex_unlock>:

    c0377cd1:       f0 ff 00                lock incl (%eax)

    c0377cd4:       7e 0f                   jle    c0377ce5 <.text.lock.mutex+0x7>

    c0377cd4:       7e 0f                   jle    c0377ce5 <.text..lock.mutex+0x7>

    c0377cd6:       c3                      ret



 - 'struct mutex' semantics are well-defined and are enforced if

Documentation/timers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
obj- := dummy.o



# List of programs to build

hostprogs-y := hpet_example

hostprogs-$(CONFIG_X86) := hpet_example



# Tell kbuild to always build the programs

always := $(hostprogs-y)