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

Commit 9e4144ab authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into core/printk 



Conflicts:

	kernel/printk.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents e17ba73b 6329d302

.gitignore

+10 −2
Original line number Original line Diff line number Diff line
@@ -3,6 +3,10 @@ 
# subdirectories here. Add them in the ".gitignore" file

# subdirectories here. Add them in the ".gitignore" file

# in that subdirectory instead.

# in that subdirectory instead.

#

#

# NOTE! Please use 'git-ls-files -i --exclude-standard'

# command after changing this file, to see if there are

# any tracked files which get ignored after the change.

#

# Normal rules

# Normal rules

#

#

.*

.*
@@ -18,18 +22,21 @@ 
*.lst

*.lst

*.symtypes

*.symtypes

*.order

*.order

*.elf

*.bin

*.gz





#

#

# Top-level generic files

# Top-level generic files

#

#

tags

tags

TAGS

TAGS

vmlinux*

vmlinux

!vmlinux.lds.S

System.map

System.map

Module.markers

Module.markers

Module.symvers

Module.symvers

!.gitignore

!.gitignore

!.mailmap





#

#

# Generated include files

# Generated include files
@@ -52,6 +59,7 @@ series 




# cscope files

# cscope files

cscope.*

cscope.*

ncscope.*





*.orig

*.orig

*~

*~

CREDITS

+3 −2
Original line number Original line Diff line number Diff line
@@ -2611,8 +2611,9 @@ S: Perth, Western Australia 
S: Australia

S: Australia





N: Miguel Ojeda Sandonis

N: Miguel Ojeda Sandonis

E: maxextreme@gmail.com

E: miguel.ojeda.sandonis@gmail.com

W: http://maxextreme.googlepages.com/

W: http://miguelojeda.es

W: http://jair.lab.fi.uva.es/~migojed/

D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.

D: Author of the ks0108, cfag12864b and cfag12864bfb auxiliary display drivers.

D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)

D: Maintainer of the auxiliary display drivers tree (drivers/auxdisplay/*)

S: C/ Mieses 20, 9-B

S: C/ Mieses 20, 9-B

Documentation/ABI/testing/sysfs-class-bdi

+4 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,10 @@ MAJOR:MINOR 
	non-block filesystems which provide their own BDI, such as NFS

	non-block filesystems which provide their own BDI, such as NFS

	and FUSE.

	and FUSE.





MAJOR:MINOR-fuseblk



	Value of st_dev on fuseblk filesystems.



default

default





	The default backing dev, used for non-block device backed

	The default backing dev, used for non-block device backed

Documentation/DocBook/kernel-locking.tmpl

+25 −0
Original line number Original line Diff line number Diff line
@@ -703,6 +703,31 @@ 
</sect1>

</sect1>

</chapter>

</chapter>





<chapter id="trylock-functions">

 <title>The trylock Functions</title>

  <para>

   There are functions that try to acquire a lock only once and immediately

   return a value telling about success or failure to acquire the lock.

   They can be used if you need no access to the data protected with the lock

   when some other thread is holding the lock. You should acquire the lock

   later if you then need access to the data protected with the lock.

  </para>



  <para>

    <function>spin_trylock()</function> does not spin but returns non-zero if

    it acquires the spinlock on the first try or 0 if not. This function can

    be used in all contexts like <function>spin_lock</function>: you must have

    disabled the contexts that might interrupt you and acquire the spin lock.

  </para>



  <para>

    <function>mutex_trylock()</function> does not suspend your task

    but returns non-zero if it could lock the mutex on the first try

    or 0 if not. This function cannot be safely used in hardware or software

    interrupt contexts despite not sleeping.

  </para>

</chapter>



  <chapter id="Examples">

  <chapter id="Examples">

   <title>Common Examples</title>

   <title>Common Examples</title>

    <para>

    <para>

Documentation/DocBook/kgdb.tmpl

+6 −14
Original line number Original line Diff line number Diff line
@@ -84,10 +84,9 @@ 
    runs an instance of gdb against the vmlinux file which contains

    runs an instance of gdb against the vmlinux file which contains

    the symbols (not boot image such as bzImage, zImage, uImage...).

    the symbols (not boot image such as bzImage, zImage, uImage...).

    In gdb the developer specifies the connection parameters and

    In gdb the developer specifies the connection parameters and

    connects to kgdb.  Depending on which kgdb I/O modules exist in

    connects to kgdb.  The type of connection a developer makes with

    the kernel for a given architecture, it may be possible to debug

    gdb depends on the availability of kgdb I/O modules compiled as

    the test machine's kernel with the development machine using a

    builtin's or kernel modules in the test machine's kernel.

    rs232 or ethernet connection.

    </para>

    </para>

  </chapter>

  </chapter>

  <chapter id="CompilingAKernel">

  <chapter id="CompilingAKernel">
@@ -223,7 +222,7 @@ 
  </para>

  </para>

  <para>

  <para>

  IMPORTANT NOTE: Using this option with kgdb over the console

  IMPORTANT NOTE: Using this option with kgdb over the console

  (kgdboc) or kgdb over ethernet (kgdboe) is not supported.

  (kgdboc) is not supported.

  </para>

  </para>

  </sect1>

  </sect1>

  </chapter>

  </chapter>
@@ -249,18 +248,11 @@ 
    (gdb) target remote /dev/ttyS0

    (gdb) target remote /dev/ttyS0

    </programlisting>

    </programlisting>

    <para>

    <para>

    Example (kgdb to a terminal server):

    Example (kgdb to a terminal server on tcp port 2012):

    </para>

    </para>

    <programlisting>

    <programlisting>

    % gdb ./vmlinux

    % gdb ./vmlinux

    (gdb) target remote udp:192.168.2.2:6443

    (gdb) target remote 192.168.2.2:2012

    </programlisting>

    <para>

    Example (kgdb over ethernet):

    </para>

    <programlisting>

    % gdb ./vmlinux

    (gdb) target remote udp:192.168.2.2:6443

    </programlisting>

    </programlisting>

    <para>

    <para>

    Once connected, you can debug a kernel the way you would debug an

    Once connected, you can debug a kernel the way you would debug an