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

Commit 1e8c5739 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (21 commits)
  BUG_ON() Conversion in drivers/video/
  BUG_ON() Conversion in drivers/parisc/
  BUG_ON() Conversion in drivers/block/
  BUG_ON() Conversion in sound/sparc/cs4231.c
  BUG_ON() Conversion in drivers/s390/block/dasd.c
  BUG_ON() Conversion in lib/swiotlb.c
  BUG_ON() Conversion in kernel/cpu.c
  BUG_ON() Conversion in ipc/msg.c
  BUG_ON() Conversion in block/elevator.c
  BUG_ON() Conversion in fs/coda/
  BUG_ON() Conversion in fs/binfmt_elf_fdpic.c
  BUG_ON() Conversion in input/serio/hil_mlc.c
  BUG_ON() Conversion in md/dm-hw-handler.c
  BUG_ON() Conversion in md/bitmap.c
  The comment describing how MS_ASYNC works in msync.c is confusing
  rcu: undeclared variable used in documentation
  fix typos "wich" -> "which"
  typo patch for fs/ufs/super.c
  Fix simple typos
  tabify drivers/char/Makefile
  ...
parents d71eecf3 232443e2

Documentation/RCU/whatisRCU.txt

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ uses of RCU may be found in listRCU.txt, arrayRCU.txt, and NMI-RCU.txt. 
		struct foo *new_fp;

		struct foo *old_fp;



		new_fp = kmalloc(sizeof(*fp), GFP_KERNEL);

		new_fp = kmalloc(sizeof(*new_fp), GFP_KERNEL);

		spin_lock(&foo_mutex);

		old_fp = gbl_foo;

		*new_fp = *old_fp;
@@ -461,7 +461,7 @@ The foo_update_a() function might then be written as follows: 
		struct foo *new_fp;

		struct foo *old_fp;



		new_fp = kmalloc(sizeof(*fp), GFP_KERNEL);

		new_fp = kmalloc(sizeof(*new_fp), GFP_KERNEL);

		spin_lock(&foo_mutex);

		old_fp = gbl_foo;

		*new_fp = *old_fp;

Documentation/arm/Booting

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ to store page tables. The recommended placement is 32KiB into RAM. 


In either case, the following conditions must be met:



- Quiesce all DMA capable devicess so that memory does not get

- Quiesce all DMA capable devices so that memory does not get

  corrupted by bogus network packets or disk data. This will save

  you many hours of debug.

Documentation/arm/README

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ Modules 
  Although modularisation is supported (and required for the FP emulator),

  each module on an ARM2/ARM250/ARM3 machine when is loaded will take

  memory up to the next 32k boundary due to the size of the pages.

  Therefore, modularisation on these machines really worth it?

  Therefore, is modularisation on these machines really worth it?



  However, ARM6 and up machines allow modules to take multiples of 4k, and

  as such Acorn RiscPCs and other architectures using these processors can

Documentation/arm/Setup

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ below: 
 video_y



   This describes the character position of cursor on VGA console, and

   is otherwise unused. (should not used for other console types, and

   is otherwise unused. (should not be used for other console types, and

   should not be used for other purposes).



 memc_control_reg

Documentation/filesystems/proc.txt

+3 −3
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ Table 1-1: Process specific entries in /proc 
..............................................................................

 File    Content                                        

 cmdline Command line arguments                         

 cpu	 Current and last cpu in wich it was executed		(2.4)(smp)

 cpu	 Current and last cpu in which it was executed		(2.4)(smp)

 cwd	 Link to the current working directory

 environ Values of environment variables      

 exe	 Link to the executable of this process
@@ -309,13 +309,13 @@ is the same by default: 
  > cat /proc/irq/0/smp_affinity 

  ffffffff



It's a bitmask, in wich you can specify wich CPUs can handle the IRQ, you can

It's a bitmask, in which you can specify which CPUs can handle the IRQ, you can

set it by doing:



  > echo 1 > /proc/irq/prof_cpu_mask



This means that only the first CPU will handle the IRQ, but you can also echo 5

wich means that only the first and fourth CPU can handle the IRQ.

which means that only the first and fourth CPU can handle the IRQ.



The way IRQs are routed is handled by the IO-APIC, and it's Round Robin

between all the CPUs which are allowed to handle it. As usual the kernel has