Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

             maxcpus=2 will only boot 2. You can choose to bring the

             other cpus later online, read FAQ's for more info.

additional_cpus=n	[x86_64 only] use this to limit hotpluggable cpus.

                        This option sets

additional_cpus*=n	Use this to limit hotpluggable cpus. This option sets

			cpu_possible_map = cpu_present_map + additional_cpus

(*) Option valid only for following architectures

- x86_64, ia64

ia64 and x86_64 use the number of disabled local apics in ACPI tables MADT

to determine the number of potentially hot-pluggable cpus. The implementation

should only rely on this to count the #of cpus, but *MUST* not rely on the

apicid values in those tables for disabled apics. In the event BIOS doesnt

mark such hot-pluggable cpus as disabled entries, one could use this

parameter "additional_cpus=x" to represent those cpus in the cpu_possible_map.

CPU maps and such

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

[More on cpumaps and primitive to manipulate, please check

	return (0);

}

int additional_cpus __initdata = -1;

static __init int setup_additional_cpus(char *s)

{

	if (s)

		additional_cpus = simple_strtol(s, NULL, 0);

	return 0;

}

early_param("additional_cpus", setup_additional_cpus);

/*

 * cpu_possible_map should be static, it cannot change as cpu's

 * are onlined, or offlined. The reason is per-cpu data-structures

 * are allocated by some modules at init time, and dont expect to

 * do this dynamically on cpu arrival/departure.

 * cpu_present_map on the other hand can change dynamically.

 * In case when cpu_hotplug is not compiled, then we resort to current

 * behaviour, which is cpu_possible == cpu_present.

 * - Ashok Raj

 *

 * Three ways to find out the number of additional hotplug CPUs:

 * - If the BIOS specified disabled CPUs in ACPI/mptables use that.

 * - The user can overwrite it with additional_cpus=NUM

 * - Otherwise don't reserve additional CPUs.

 */

__init void prefill_possible_map(void)

{

	int i;

	int possible, disabled_cpus;

	disabled_cpus = total_cpus - available_cpus;

 	if (additional_cpus == -1) {

 		if (disabled_cpus > 0)

			additional_cpus = disabled_cpus;

 		else

			additional_cpus = 0;

 	}

	possible = available_cpus + additional_cpus;

	if (possible > NR_CPUS)

		possible = NR_CPUS;

	printk(KERN_INFO "SMP: Allowing %d CPUs, %d hotplug CPUs\n",

		possible, max((possible - available_cpus), 0));

	for (i = 0; i < possible; i++)

		cpu_set(i, cpu_possible_map);

}

int acpi_map_lsapic(acpi_handle handle, int *pcpu)

{

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

.mem.offset 0,0; st8.spill [r2]=r8		// store return value in slot for r8

.mem.offset 8,0; st8.spill [r3]=r10		// clear error indication in slot for r10

	br.call.sptk.many rp=syscall_trace_leave // give parent a chance to catch return value

.ret3:	br.cond.sptk .work_pending_syscall_end

.ret3:

(pUStk)	cmp.eq.unc p6,p0=r0,r0			// p6 <- pUStk

	br.cond.sptk .work_pending_syscall_end

strace_error:

	ld8 r3=[r2]				// load pt_regs.r8

#include <linux/string.h>

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memchr);

EXPORT_SYMBOL(memcmp);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memscan);

EXPORT_SYMBOL(strcat);

EXPORT_SYMBOL(strchr);

EXPORT_SYMBOL(strcmp);

EXPORT_SYMBOL(strcpy);

EXPORT_SYMBOL(strlen);

EXPORT_SYMBOL(strncat);

EXPORT_SYMBOL(strncmp);

EXPORT_SYMBOL(strncpy);

EXPORT_SYMBOL(strnlen);

EXPORT_SYMBOL(strrchr);

EXPORT_SYMBOL(strstr);

EXPORT_SYMBOL(strpbrk);

#include <asm/checksum.h>

EXPORT_SYMBOL(ip_fast_csum);		/* hand-coded assembly */

	if (early_console_setup(*cmdline_p) == 0)

		mark_bsp_online();

	parse_early_param();

#ifdef CONFIG_ACPI

	/* Initialize the ACPI boot-time table parser */

	acpi_table_init();

setup_per_cpu_areas (void)

{

	/* start_kernel() requires this... */

#ifdef CONFIG_ACPI_HOTPLUG_CPU

	prefill_possible_map();

#endif

}

/*