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

Commit c12489ad authored by Steve French's avatar Steve French
Browse files

Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

parents ff7feac9 1e185b97

Documentation/DocBook/kernel-api.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -386,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/block/biodoc.txt

+2 −2
Original line number Diff line number Diff line
@@ -1063,8 +1063,8 @@ Aside: 
4.4 I/O contexts

I/O contexts provide a dynamically allocated per process data area. They may

be used in I/O schedulers, and in the block layer (could be used for IO statis,

priorities for example). See *io_context in drivers/block/ll_rw_blk.c, and

as-iosched.c for an example of usage in an i/o scheduler.

priorities for example). See *io_context in block/ll_rw_blk.c, and as-iosched.c

for an example of usage in an i/o scheduler.





5. Scalability related changes

Documentation/feature-removal-schedule.txt

+9 −0
Original line number Diff line number Diff line
@@ -140,3 +140,12 @@ What: EXPORT_SYMBOL(lookup_hash) 
When:	January 2006

Why:	Too low-level interface.  Use lookup_one_len or lookup_create instead.

Who:	Christoph Hellwig <hch@lst.de>



---------------------------



What:	START_ARRAY ioctl for md

When:	July 2006

Files:	drivers/md/md.c

Why:	Not reliable by design - can fail when most needed.

	Alternatives exist

Who:	NeilBrown <neilb@suse.de>

Documentation/oops-tracing.txt

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ the disk is not available then you have three options :- 
    has restarted.  Messy but it is the only option if you have not

    planned for a crash. Alternatively, you can take a picture of

    the screen with a digital camera - not nice, but better than

    nothing.

    nothing.  If the messages scroll off the top of the console, you

    may find that booting with a higher resolution (eg, vga=791)

    will allow you to read more of the text. (Caveat: This needs vesafb,

    so won't help for 'early' oopses)



(2) Boot with a serial console (see Documentation/serial-console.txt),

    run a null modem to a second machine and capture the output there

Documentation/x86_64/boot-options.txt

+10 −2
Original line number Diff line number Diff line
@@ -7,10 +7,12 @@ Machine check 


   mce=off disable machine check

   mce=bootlog Enable logging of machine checks left over from booting.

               Disabled by default because some BIOS leave bogus ones.

               Disabled by default on AMD because some BIOS leave bogus ones.

               If your BIOS doesn't do that it's a good idea to enable though

               to make sure you log even machine check events that result

               in a reboot.

               in a reboot. On Intel systems it is enabled by default.

   mce=nobootlog

		Disable boot machine check logging.

   mce=tolerancelevel (number)

		0: always panic, 1: panic if deadlock possible,

		2: try to avoid panic, 3: never panic or exit (for testing)
@@ -122,6 +124,9 @@ SMP 


  cpumask=MASK   only use cpus with bits set in mask



  additional_cpus=NUM Allow NUM more CPUs for hotplug

		 (defaults are specified by the BIOS or half the available CPUs)



NUMA



  numa=off	Only set up a single NUMA node spanning all memory.
@@ -188,6 +193,9 @@ Debugging 


  kstack=N   Print that many words from the kernel stack in oops dumps.



  pagefaulttrace Dump all page faults. Only useful for extreme debugging

		and will create a lot of output.



Misc



  noreplacement  Don't replace instructions with more appropiate ones