Merge branch 'linus' into x86/pebs (0e50a4c6) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/cgroups.txt

+2 −2

Original line number	Diff line number	Diff line
		@@ -310,8 +310,8 @@ and then start a subshell 'sh' in that cgroup:
		cd /dev/cgroup
		mkdir Charlie
		cd Charlie
		/bin/echo 2-3 > cpus
		/bin/echo 1 > mems
		/bin/echo 2-3 > cpuset.cpus
		/bin/echo 1 > cpuset.mems
		/bin/echo $$ > tasks
		sh
		# The subshell 'sh' is now running in cgroup Charlie

+8 −0

Original line number	Diff line number	Diff line
		@@ -289,6 +289,14 @@ Who: Glauber Costa <gcosta@redhat.com>

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

		What: old style serial driver for ColdFire (CONFIG_SERIAL_COLDFIRE)
		When: 2.6.28
		Why: This driver still uses the old interface and has been replaced
		by CONFIG_SERIAL_MCF.
		Who: Sebastian Siewior <sebastian@breakpoint.cc>

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

		What: /sys/o2cb symlink
		When: January 2010
		Why: /sys/fs/o2cb is the proper location for this information - /sys/o2cb

+2 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,8 @@ point2: Set the pwm speed at a higher temperature bound.

		The ADT7473 will scale the pwm between the lower and higher pwm speed when
		the temperature is between the two temperature boundaries. PWM values range
		from 0 (off) to 255 (full speed).
		from 0 (off) to 255 (full speed). Fan speed will be set to maximum when the
		temperature sensor associated with the PWM control exceeds temp#_max.

		Notes
		-----

+6 −3

Original line number	Diff line number	Diff line
		@@ -398,9 +398,6 @@ and is between 256 and 4096 characters. It is defined in the file
		cio_ignore= [S390]
		See Documentation/s390/CommonIO for details.

		cio_msg= [S390]
		See Documentation/s390/CommonIO for details.

		clock= [BUGS=X86-32, HW] gettimeofday clocksource override.
		[Deprecated]
		Forces specified clocksource (if available) to be used
		@@ -689,6 +686,12 @@ and is between 256 and 4096 characters. It is defined in the file
		floppy= [HW]
		See Documentation/floppy.txt.

		force_pal_cache_flush
		[IA-64] Avoid check_sal_cache_flush which may hang on
		buggy SAL_CACHE_FLUSH implementations. Using this
		parameter will force ia64_sal_cache_flush to call
		ia64_pal_cache_flush instead of SAL_CACHE_FLUSH.

		gamecon.map[2\|3]=
		[HW,JOY] Multisystem joystick and NES/SNES/PSX pad
		support via parallel port (up to 5 devices per port)

+11 −1

Original line number	Diff line number	Diff line
		@@ -994,7 +994,17 @@ The Linux kernel has eight basic CPU memory barriers:
		DATA DEPENDENCY read_barrier_depends() smp_read_barrier_depends()


		All CPU memory barriers unconditionally imply compiler barriers.
		All memory barriers except the data dependency barriers imply a compiler
		barrier. Data dependencies do not impose any additional compiler ordering.

		Aside: In the case of data dependencies, the compiler would be expected to
		issue the loads in the correct order (eg. `a[b]` would have to load the value
		of b before loading a[b]), however there is no guarantee in the C specification
		that the compiler may not speculate the value of b (eg. is equal to 1) and load
		a before b (eg. tmp = a[1]; if (b != 1) tmp = a[b]; ). There is also the
		problem of a compiler reloading b after having loaded a[b], thus having a newer
		copy of b than a[b]. A consensus has not yet been reached about these problems,
		however the ACCESS_ONCE macro is a good place to start looking.

		SMP memory barriers are reduced to compiler barriers on uniprocessor compiled
		systems because it is assumed that a CPU will appear to be self-consistent,