Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c5580a7e authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'forcedeth'

parents b04a92e1 d33a73c8

Documentation/cpu-hotplug.txt

+11 −5
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,12 +46,10 @@ 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	Use this to limit hotpluggable cpus. This option sets

additional_cpus=n	[x86_64, s390 only] 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
@@ -58,6 +58,12 @@ 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

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 16

EXTRAVERSION =-rc3

EXTRAVERSION =-rc4

NAME=Sliding Snow Leopard



# *DOCUMENTATION*

arch/s390/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -80,6 +80,10 @@ config HOTPLUG_CPU 
	  can be controlled through /sys/devices/system/cpu/cpu#.

	  Say N if you want to disable CPU hotplug.



config DEFAULT_MIGRATION_COST

	int

	default "1000000"



config MATHEMU

	bool "IEEE FPU emulation"

	depends on MARCH_G5

arch/s390/kernel/compat_linux.c

+2 −2
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ asmlinkage long sys32_fstat64(unsigned long fd, struct stat64_emu31 __user * sta 
	return ret;

}



asmlinkage long sys32_fstatat(unsigned int dfd, char __user *filename,

asmlinkage long sys32_fstatat64(unsigned int dfd, char __user *filename,

				struct stat64_emu31 __user* statbuf, int flag)

{

	struct kstat stat;

arch/s390/kernel/compat_wrapper.S

+3 −3
Original line number Diff line number Diff line
@@ -1523,13 +1523,13 @@ compat_sys_futimesat_wrapper: 
	llgtr	%r4,%r4			# struct timeval *

	jg	compat_sys_futimesat



	.globl sys32_fstatat_wrapper

sys32_fstatat_wrapper:

	.globl sys32_fstatat64_wrapper

sys32_fstatat64_wrapper:

	llgfr	%r2,%r2			# unsigned int

	llgtr	%r3,%r3			# char *

	llgtr	%r4,%r4			# struct stat64 *

	lgfr	%r5,%r5			# int

	jg	sys32_fstatat

	jg	sys32_fstatat64



	.globl sys_unlinkat_wrapper

sys_unlinkat_wrapper: