linux.git/arch/sh/kernel/setup.c, branch v2.6.35-rc4

Merge branch 'sh/lmb'

2010-05-13T08:48:05+00:00

Conflicts:
	arch/sh/kernel/setup.c

sh: Ensure active regions have a backing PMB entry.

2010-05-11T04:52:50+00:00

In the NUMA or memory hot-add case where system memory has been
partitioned up, we immediately run in to a situation where the existing
PMB entry doesn't cover the new range (primarily as a result of the entry
size being shrunk to match the node size early in the initialization). In
order to fix this up it's necessary to preload a PMB mapping for the new
range prior to activation in order to circumvent reset by MMU.

Signed-off-by: Paul Mundt

sh: bootmem refactoring.

2010-05-11T04:32:19+00:00

This reworks much of the bootmem setup and initialization code allowing
us to get rid of duplicate work between the NUMA and non-NUMA cases. The
end result is that we end up with a much more flexible interface for
supporting more complex topologies (fake NUMA, highmem, etc, etc.) which
is entirely LMB backed. This is an incremental step for more NUMA work as
well as gradually enabling migration off of bootmem entirely.

Signed-off-by: Paul Mundt

sh: rework memory limits to work with LMB.

2010-05-10T11:17:25+00:00

This reworks the memory limit handling to tie in through the available
LMB infrastructure. This requires a bit of reordering as we need to have
all of the LMB reservations taken care of prior to establishing the
limits.

While we're at it, the crash kernel reservation semantics are reworked
so that we allocate from the bottom up and reduce the risk of having
to disable the memory limit due to a clash with the crash kernel
reservation.

Signed-off-by: Paul Mundt

sh: enable LMB region setup via machvec.

2010-05-10T06:39:05+00:00

This plugs in a memory init callback in the machvec to permit boards to
wire up various bits of memory directly in to LMB. A generic machvec
implementation is provided that simply wraps around the normal
Kconfig-derived memory start/size.

Signed-off-by: Paul Mundt

sh: shuffle the elfcorehdr handling over to the crash dump code.

2010-05-07T08:58:55+00:00

The elfcorehdr parsing was just tossed in setup.c, but nothing outside of
the crash dump code/vmcore bits require it, so we just move it out of the
way, as per ppc.

Signed-off-by: Paul Mundt

sh: bump up extra LMB reservations in bootmem init.

2010-05-07T06:10:42+00:00

This bumps up the extra LMB reservations in ordering so that they're
accounted for prior to iterating over the region list. This ensures that
reservations are visible both within the LMB and bootmem context.

Signed-off-by: Paul Mundt

sh: convert initrd reservation to LMB.

2010-05-07T06:10:07+00:00

This switches over from bootmem -> LMB for the initrd area reservation.

Signed-off-by: Paul Mundt

sh: convert kexec crash kernel management to LMB.

2010-05-07T05:54:55+00:00

This migrates the crash kernel handling off of bootmem and over to LMB.

Signed-off-by: Paul Mundt

sh: Make initrd detection more robust.

2010-05-06T06:09:45+00:00

Various boot loaders go to various extents to thwart the initrd detection
logic (mostly on account of not being able to be bothered with adhering
to the established boot ABI), so we make the detection logic a bit more
robust. This makes it possible to work around the SDK7786's firmware's
attempts to thwart compressed image booting. Victory is mine.

Signed-off-by: Paul Mundt