Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git (e601ef22) · Commits · e / devices / android_kernel_sony_msm8998

Documentation/cpu-hotplug.txt

+19 −3

Original line number	Diff line number	Diff line
		@@ -11,6 +11,8 @@
		Joel Schopp <jschopp@austin.ibm.com>
		ia64/x86_64:
		Ashok Raj <ashok.raj@intel.com>
		s390:
		Heiko Carstens <heiko.carstens@de.ibm.com>

		Authors: Ashok Raj <ashok.raj@intel.com>
		Lots of feedback: Nathan Lynch <nathanl@austin.ibm.com>,
		@@ -44,10 +46,24 @@ maxcpus=n Restrict boot time cpus to n. Say if you have 4 cpus, using
		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.
		additional_cpus=n [x86_64, s390 only] use this to limit hotpluggable cpus.
		This option sets
		cpu_possible_map = cpu_present_map + additional_cpus

		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.


		possible_cpus=n [s390 only] use this to set hotpluggable cpus.
		This option sets possible_cpus bits in
		cpu_possible_map. Thus keeping the numbers of bits set
		constant even if the machine gets rebooted.
		This option overrides additional_cpus.

		CPU maps and such
		-----------------
		[More on cpumaps and primitive to manipulate, please check

+5 −0

Original line number	Diff line number	Diff line
		@@ -1133,6 +1133,8 @@ running once the system is up.
		Mechanism 1.
		conf2 [IA-32] Force use of PCI Configuration
		Mechanism 2.
		nommconf [IA-32,X86_64] Disable use of MMCONFIG for PCI
		Configuration
		nosort [IA-32] Don't sort PCI devices according to
		order given by the PCI BIOS. This sorting is
		done to get a device order compatible with
		@@ -1636,6 +1638,9 @@ running once the system is up.
		Format:
		<irq>,<irq_mask>,<io>,<full_duplex>,<do_sound>,<lockup_hack>[,<irq2>[,<irq3>[,<irq4>]]]

		norandmaps Don't use address space randomization
		Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space


		______________________________________________________________________
		Changelog:

+23 −0

Original line number	Diff line number	Diff line
		1 Release Date : Wed Feb 03 14:31:44 PST 2006 - Sumant Patro <Sumant.Patro@lsil.com>
		2 Current Version : 00.00.02.04
		3 Older Version : 00.00.02.04

		i. Support for 1078 type (ppc IOP) controller, device id : 0x60 added.
		During initialization, depending on the device id, the template members
		are initialized with function pointers specific to the ppc or
		xscale controllers.

		-Sumant Patro <Sumant.Patro@lsil.com>

		1 Release Date : Fri Feb 03 14:16:25 PST 2006 - Sumant Patro
		<Sumant.Patro@lsil.com>
		2 Current Version : 00.00.02.04
		3 Older Version : 00.00.02.02
		i. Register 16 byte CDB capability with scsi midlayer

		"Ths patch properly registers the 16 byte command length capability of the
		megaraid_sas controlled hardware with the scsi midlayer. All megaraid_sas
		hardware supports 16 byte CDB's."

		-Joshua Giles <joshua_giles@dell.com>

		1 Release Date : Mon Jan 23 14:09:01 PST 2006 - Sumant Patro <Sumant.Patro@lsil.com>
		2 Current Version : 00.00.02.02
		3 Older Version : 00.00.02.01

+4 −5

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 16
		EXTRAVERSION =-rc3
		EXTRAVERSION =-rc4
		NAME=Sliding Snow Leopard

		# DOCUMENTATION
		@@ -106,13 +106,12 @@ KBUILD_OUTPUT := $(shell cd $(KBUILD_OUTPUT) && /bin/pwd)
		$(if $(KBUILD_OUTPUT),, \
		$(error output directory "$(saved-output)" does not exist))

		.PHONY: $(MAKECMDGOALS) cdbuilddir
		$(MAKECMDGOALS) _all: cdbuilddir
		.PHONY: $(MAKECMDGOALS)

		cdbuilddir:
		$(filter-out _all,$(MAKECMDGOALS)) _all:
		$(if $(KBUILD_VERBOSE:1=),@)$(MAKE) -C $(KBUILD_OUTPUT) \
		KBUILD_SRC=$(CURDIR) \
		KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile $(MAKECMDGOALS)
		KBUILD_EXTMOD="$(KBUILD_EXTMOD)" -f $(CURDIR)/Makefile $@

		# Leave processing to above invocation of make
		skip-makefile := 1

+1 −1

Original line number	Diff line number	Diff line
		@@ -111,7 +111,7 @@
		CALL(sys_statfs)
		/* 100 */ CALL(sys_fstatfs)
		CALL(sys_ni_syscall)
		CALL(OBSOLETE(sys_socketcall))
		CALL(OBSOLETE(ABI(sys_socketcall, sys_oabi_socketcall)))
		CALL(sys_syslog)
		CALL(sys_setitimer)
		/* 105 */ CALL(sys_getitimer)