Merge branch 'master' into upstream-fixes

S: Spain

S: Spain

N: Linus Torvalds

N: Linus Torvalds

E: torvalds@osdl.org

E: torvalds@linux-foundation.org

D: Original kernel hacker

D: Original kernel hacker

S: 12725 SW Millikan Way, Suite 400

S: 12725 SW Millikan Way, Suite 400

S: Beaverton, Oregon 97005

S: Beaverton, Oregon 97005

    If the new code is substantial, addition of subsystem-specific fault

    If the new code is substantial, addition of subsystem-specific fault

    injection might be appropriate.

    injection might be appropriate.

22: Newly-added code has been compiled with `gcc -W'.  This will generate

    lots of noise, but is good for finding bugs like "warning: comparison

    between signed and unsigned".

Linus Torvalds is the final arbiter of all changes accepted into the

Linus Torvalds is the final arbiter of all changes accepted into the

Linux kernel.  His e-mail address is <torvalds@osdl.org>.  He gets

Linux kernel.  His e-mail address is <torvalds@linux-foundation.org>. 

a lot of e-mail, so typically you should do your best to -avoid- sending

He gets a lot of e-mail, so typically you should do your best to -avoid-

him e-mail.

sending him e-mail. 

Patches which are bug fixes, are "obvious" changes, or similarly

Patches which are bug fixes, are "obvious" changes, or similarly

require little discussion should be sent or CC'd to Linus.  Patches

require little discussion should be sent or CC'd to Linus.  Patches

Who:	Len Brown <len.brown@intel.com>

Who:	Len Brown <len.brown@intel.com>

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

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

What:	JFFS (version 1)

When:	2.6.21

Why:	Unmaintained for years, superceded by JFFS2 for years.

Who:	Jeff Garzik <jeff@garzik.org>

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

memory image to a dump file on the local disk, or across the network to

memory image to a dump file on the local disk, or across the network to

a remote system.

a remote system.

Kdump and kexec are currently supported on the x86, x86_64, ppc64 and IA64

Kdump and kexec are currently supported on the x86, x86_64, ppc64 and ia64

architectures.

architectures.

When the system kernel boots, it reserves a small section of memory for

When the system kernel boots, it reserves a small section of memory for

2) Download the kexec-tools user-space package from the following URL:

2) Download the kexec-tools user-space package from the following URL:

http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-testing-20061214.tar.gz

http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/kexec-tools-testing.tar.gz

This is a symlink to the latest version, which at the time of writing is

20061214, the only release of kexec-tools-testing so far. As other versions

are made released, the older onese will remain available at

http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/

Note: Latest kexec-tools-testing git tree is available at

Note: Latest kexec-tools-testing git tree is available at

3) Unpack the tarball with the tar command, as follows:

3) Unpack the tarball with the tar command, as follows:

   tar xvpzf kexec-tools-testing-20061214.tar.gz

   tar xvpzf kexec-tools-testing.tar.gz

4) Change to the kexec-tools-1.101 directory, as follows:

4) Change to the kexec-tools directory, as follows:

   cd kexec-tools-testing-20061214

   cd kexec-tools-testing-VERSION

5) Configure the package, as follows:

5) Configure the package, as follows:

Dump-capture kernel config options (Arch Dependent, ia64)

Dump-capture kernel config options (Arch Dependent, ia64)

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

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

(To be filled)

- No specific options are required to create a dump-capture kernel

  for ia64, other than those specified in the arch idependent section

  above. This means that it is possible to use the system kernel

  as a dump-capture kernel if desired.

  The crashkernel region can be automatically placed by the system

  kernel at run time. This is done by specifying the base address as 0,

  or omitting it all together.

  crashkernel=256M@0

  or

  crashkernel=256M

  If the start address is specified, note that the start address of the

  kernel will be aligned to 64Mb, so if the start address is not then

  any space below the alignment point will be wasted.

Boot into System Kernel

Boot into System Kernel

   On ppc64, use "crashkernel=128M@32M".

   On ppc64, use "crashkernel=128M@32M".

   On ia64, 256M@256M is a generous value that typically works.

   The region may be automatically placed on ia64, see the

   dump-capture kernel config option notes above.

Load the Dump-capture Kernel

Load the Dump-capture Kernel

============================

============================

For ppc64:

For ppc64:

	- Use vmlinux

	- Use vmlinux

For ia64:

For ia64:

	(To be filled)

	- Use vmlinux or vmlinuz.gz

If you are using a uncompressed vmlinux image then use following command

If you are using a uncompressed vmlinux image then use following command

to load dump-capture kernel.

to load dump-capture kernel.

   --initrd=<initrd-for-dump-capture-kernel> \

   --initrd=<initrd-for-dump-capture-kernel> \

   --append="root=<root-dev> <arch-specific-options>"

   --append="root=<root-dev> <arch-specific-options>"

Please note, that --args-linux does not need to be specified for ia64.

It is planned to make this a no-op on that architecture, but for now

it should be omitted

Following are the arch specific command line options to be used while

Following are the arch specific command line options to be used while

loading dump-capture kernel.

loading dump-capture kernel.

For i386 and x86_64:

For i386, x86_64 and ia64:

	"init 1 irqpoll maxcpus=1"

	"init 1 irqpoll maxcpus=1"

For ppc64:

For ppc64:

	"init 1 maxcpus=1 noirqdistrib"

	"init 1 maxcpus=1 noirqdistrib"

For IA64

	(To be filled)

Notes on loading the dump-capture kernel:

Notes on loading the dump-capture kernel: