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

Commit 36a2c6b2 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream

parents 95916edd f1d39b29

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ include/config 
include/linux/autoconf.h

include/linux/compile.h

include/linux/version.h

include/linux/utsrelease.h



# stgit generated dirs

patches-*



# quilt's files

patches

series

Documentation/DocBook/kernel-api.tmpl

+5 −4
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ 
!Iinclude/linux/ktime.h

!Iinclude/linux/hrtimer.h

!Ekernel/hrtimer.c

     </sect1>

     <sect1><title>Workqueues and Kevents</title>

!Ekernel/workqueue.c

     </sect1>

     <sect1><title>Internal Functions</title>

!Ikernel/exit.c
@@ -300,7 +303,7 @@ X!Ekernel/module.c 
     </sect1>



     <sect1><title>Resources Management</title>

!Ekernel/resource.c

!Ikernel/resource.c

     </sect1>



     <sect1><title>MTRR Handling</title>
@@ -312,9 +315,7 @@ X!Ekernel/module.c 
!Edrivers/pci/pci-driver.c

!Edrivers/pci/remove.c

!Edrivers/pci/pci-acpi.c

<!-- kerneldoc does not understand __devinit

X!Edrivers/pci/search.c

 -->

!Edrivers/pci/search.c

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

<!-- FIXME: Removed for now since no structured comments in source

Documentation/SubmittingPatches

+4 −6
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ kernel, the process can sometimes be daunting if you're not familiar 
with "the system."  This text is a collection of suggestions which

can greatly increase the chances of your change being accepted.



If you are submitting a driver, also read Documentation/SubmittingDrivers.

Read Documentation/SubmitChecklist for a list of items to check

before submitting code.  If you are submitting a driver, also read

Documentation/SubmittingDrivers.
@@ -74,9 +76,6 @@ There are a number of scripts which can aid in this: 
Quilt:

http://savannah.nongnu.org/projects/quilt



Randy Dunlap's patch scripts:

http://www.xenotime.net/linux/scripts/patching-scripts-002.tar.gz



Andrew Morton's patch scripts:

http://www.zip.com.au/~akpm/linux/patches/

Instead of these scripts, quilt is the recommended patch management
@@ -484,7 +483,7 @@ Greg Kroah-Hartman "How to piss off a kernel subsystem maintainer". 
  <http://www.kroah.com/log/2005/10/19/>

  <http://www.kroah.com/log/2006/01/11/>



NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!.

NO!!!! No more huge patch bombs to linux-kernel@vger.kernel.org people!

  <http://marc.theaimsgroup.com/?l=linux-kernel&m=112112749912944&w=2>



Kernel Documentation/CodingStyle
@@ -493,4 +492,3 @@ Kernel Documentation/CodingStyle 
Linus Torvald's mail on the canonical patch format:

  <http://lkml.org/lkml/2005/4/7/183>

--
 
Last updated on 17 Nov 2005.

Documentation/accounting/delay-accounting.txt

+6 −4
Original line number Diff line number Diff line
@@ -64,11 +64,13 @@ Compile the kernel with 
	CONFIG_TASK_DELAY_ACCT=y

	CONFIG_TASKSTATS=y



Enable the accounting at boot time by adding

the following to the kernel boot options

	delayacct

Delay accounting is enabled by default at boot up.

To disable, add

   nodelayacct

to the kernel boot options. The rest of the instructions

below assume this has not been done.



and after the system has booted up, use a utility

After the system has booted up, use a utility

similar to  getdelays.c to access the delays

seen by a given task or a task group (tgid).

The utility also allows a given command to be

Documentation/cpu-hotplug.txt

+10 −2
Original line number Diff line number Diff line
@@ -251,16 +251,24 @@ A: This is what you would need in your kernel code to receive notifications. 
		return NOTIFY_OK;

	}



	static struct notifier_block foobar_cpu_notifer =

	static struct notifier_block __cpuinitdata foobar_cpu_notifer =

	{

	   .notifier_call = foobar_cpu_callback,

	};



You need to call register_cpu_notifier() from your init function.

Init functions could be of two types:

1. early init (init function called when only the boot processor is online).

2. late init (init function called _after_ all the CPUs are online).



In your init function,

For the first case, you should add the following to your init function



	register_cpu_notifier(&foobar_cpu_notifier);



For the second case, you should add the following to your init function



	register_hotcpu_notifier(&foobar_cpu_notifier);



You can fail PREPARE notifiers if something doesn't work to prepare resources.

This will stop the activity and send a following CANCELED event back.