Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

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

What:	CONFIG_FORCED_INLINING

When:	June 2006

Why:	Config option is there to see if gcc is good enough. (in january

        2006). If it is, the behavior should just be the default. If it's not,

	the option should just go away entirely.

Who:    Arjan van de Ven

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

What:   eepro100 network driver

When:   January 2007

Why:    replaced by the e100 driver

- pid_max

- powersave-nap               [ PPC only ]

- printk

- randomize_va_space

- real-root-dev               ==> Documentation/initrd.txt

- reboot-cmd                  [ SPARC only ]

- rtsig-max

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

randomize-va-space:

This option can be used to select the type of process address

space randomization that is used in the system, for architectures

that support this feature.

0 - Turn the process address space randomization off by default.

1 - Make the addresses of mmap base, stack and VDSO page randomized.

    This, among other things, implies that shared libraries will be

    loaded to random addresses. Also for PIE-linked binaries, the location

    of code start is randomized.

    With heap randomization, the situation is a little bit more

    complicated.

    There a few legacy applications out there (such as some ancient

    versions of libc.so.5 from 1996) that assume that brk area starts

    just after the end of the code+bss. These applications break when

    start of the brk area is randomized. There are however no known

    non-legacy applications that would be broken this way, so for most

    systems it is safe to choose full randomization. However there is

    a CONFIG_COMPAT_BRK option for systems with ancient and/or broken

    binaries, that makes heap non-randomized, but keeps all other

    parts of process address space randomized if randomize_va_space

    sysctl is turned on.

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

reboot-cmd: (Sparc only)

??? This seems to be a way to give an argument to the Sparc

	  This option will slow down process creation somewhat.

comment "Page alloc debug is incompatible with Software Suspend on i386"

	depends on DEBUG_KERNEL && HIBERNATION

	depends on X86_32

config DEBUG_PAGEALLOC

	bool "Debug page memory allocations"

	depends on DEBUG_KERNEL && X86_32

	depends on DEBUG_KERNEL

	help

	  Unmap pages from the kernel linear mapping after free_pages().

	  This results in a large slowdown, but helps to find certain types

# must be linked after kernel/

drivers-$(CONFIG_OPROFILE) += arch/x86/oprofile/

ifeq ($(CONFIG_X86_32),y)

# suspend and hibernation support

drivers-$(CONFIG_PM) += arch/x86/power/

ifeq ($(CONFIG_X86_32),y)

drivers-$(CONFIG_FB) += arch/x86/video/

endif

#define PLUS	4		/* show plus */

#define SPACE	8		/* space if plus */

#define LEFT	16		/* left justified */

#define SPECIAL	32		/* 0x */

#define LARGE	64		/* use 'ABCDEF' instead of 'abcdef' */

#define SMALL	32		/* Must be 32 == 0x20 */

#define SPECIAL	64		/* 0x */

#define do_div(n,base) ({ \

int __res; \

static char *number(char *str, long num, int base, int size, int precision,

		    int type)

{

	char c, sign, tmp[66];

	const char *digits = "0123456789abcdefghijklmnopqrstuvwxyz";

	/* we are called with base 8, 10 or 16, only, thus don't need "G..."  */

	static const char digits[16] = "0123456789ABCDEF"; /* "GHIJKLMNOPQRSTUVWXYZ"; */

	char tmp[66];

	char c, sign, locase;

	int i;

	if (type & LARGE)

		digits = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";

	/* locase = 0 or 0x20. ORing digits or letters with 'locase'

	 * produces same digits or (maybe lowercased) letters */

	locase = (type & SMALL);

	if (type & LEFT)

		type &= ~ZEROPAD;

	if (base < 2 || base > 36)

		tmp[i++] = '0';

	else

		while (num != 0)

			tmp[i++] = digits[do_div(num, base)];

			tmp[i++] = (digits[do_div(num, base)] | locase);

	if (i > precision)

		precision = i;

	size -= precision;

			*str++ = '0';

		else if (base == 16) {

			*str++ = '0';

			*str++ = digits[33];

			*str++ = ('X' | locase);

		}

	}

	if (!(type & LEFT))

			base = 8;

			break;

		case 'X':

			flags |= LARGE;

		case 'x':

			flags |= SMALL;

		case 'X':

			base = 16;

			break;