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

Commit 57cad808 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'merge'

parents cb18bd40 49b1e3ea
Loading
Loading
Loading
Loading
+5 −5
Original line number Diff line number Diff line
@@ -528,11 +528,11 @@ S: Oxford
S: United Kingdom

N: Luiz Fernando N. Capitulino
E: lcapitulino@terra.com.br
E: lcapitulino@prefeitura.sp.gov.br
W: http://www.telecentros.sp.gov.br
D: Little fixes and a lot of janitorial work
S: E-GOV Telecentros SP
E: lcapitulino@mandriva.com.br
E: lcapitulino@gmail.com
W: http://www.cpu.eti.br
D: misc kernel hacking
S: Mandriva
S: Brazil

N: Remy Card
+4 −4
Original line number Diff line number Diff line
@@ -698,12 +698,12 @@ these interfaces. Remember that, as defined, consistent mappings are
always going to be SAC addressable.

The first thing your driver needs to do is query the PCI platform
layer with your devices DAC addressing capabilities:
layer if it is capable of handling your devices DAC addressing
capabilities:

	int pci_dac_set_dma_mask(struct pci_dev *pdev, u64 mask);
	int pci_dac_dma_supported(struct pci_dev *hwdev, u64 mask);

This routine behaves identically to pci_set_dma_mask.  You may not
use the following interfaces if this routine fails.
You may not use the following interfaces if this routine fails.

Next, DMA addresses using this API are kept track of using the
dma64_addr_t type.  It is guaranteed to be big enough to hold any
+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
+3 −2
Original line number Diff line number Diff line
@@ -687,8 +687,9 @@ diff shows how closely related RCU and reader-writer locking can be.
	+	spin_lock(&listmutex);
		list_for_each_entry(p, head, lp) {
			if (p->key == key) {
				list_del(&p->list);
	-			list_del(&p->list);
	-			write_unlock(&listmutex);
	+			list_del_rcu(&p->list);
	+			spin_unlock(&listmutex);
	+			synchronize_rcu();
				kfree(p);
@@ -736,7 +737,7 @@ Or, for those who prefer a side-by-side listing:
 5   write_lock(&listmutex);            5   spin_lock(&listmutex);
 6   list_for_each_entry(p, head, lp) { 6   list_for_each_entry(p, head, lp) {
 7     if (p->key == key) {             7     if (p->key == key) {
 8       list_del(&p->list);            8       list_del(&p->list);
 8       list_del(&p->list);            8       list_del_rcu(&p->list);
 9       write_unlock(&listmutex);      9       spin_unlock(&listmutex);
                                       10       synchronize_rcu();
10       kfree(p);                     11       kfree(p);
+41 −35
Original line number Diff line number Diff line
Linux Kernel patch sumbittal checklist
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Here are some basic things that developers should do if they
want to see their kernel patch submittals accepted quicker.
Here are some basic things that developers should do if they want to see their
kernel patch submissions accepted more quickly.

These are all above and beyond the documentation that is provided
in Documentation/SubmittingPatches and elsewhere about submitting
Linux kernel patches.
These are all above and beyond the documentation that is provided in
Documentation/SubmittingPatches and elsewhere regarding submitting Linux
kernel patches.



- Builds cleanly with applicable or modified CONFIG options =y, =m, and =n.
  No gcc warnings/errors, no linker warnings/errors.
1: Builds cleanly with applicable or modified CONFIG options =y, =m, and
   =n.  No gcc warnings/errors, no linker warnings/errors.

- Passes allnoconfig, allmodconfig
2: Passes allnoconfig, allmodconfig

- Builds on multiple CPU arch-es by using local cross-compile tools
3: Builds on multiple CPU architectures by using local cross-compile tools
   or something like PLM at OSDL.

- ppc64 is a good architecture for cross-compilation checking because it
4: ppc64 is a good architecture for cross-compilation checking because it
   tends to use `unsigned long' for 64-bit quantities.

- Matches kernel coding style(!)
5: Matches kernel coding style(!)

- Any new or modified CONFIG options don't muck up the config menu.
6: Any new or modified CONFIG options don't muck up the config menu.

- All new Kconfig options have help text.
7: All new Kconfig options have help text.

- Has been carefully reviewed with respect to relevant Kconfig
  combinations.  This is very hard to get right with testing --
  brainpower pays off here.
8: Has been carefully reviewed with respect to relevant Kconfig
   combinations.  This is very hard to get right with testing -- brainpower
   pays off here.

- Check cleanly with sparse.
9: Check cleanly with sparse.

- Use 'make checkstack' and 'make namespacecheck' and fix any
  problems that they find.  Note:  checkstack does not point out
  problems explicitly, but any one function that uses more than
  512 bytes on the stack is a candidate for change.
10: Use 'make checkstack' and 'make namespacecheck' and fix any problems
    that they find.  Note: checkstack does not point out problems explicitly,
    but any one function that uses more than 512 bytes on the stack is a
    candidate for change.

- Include kernel-doc to document global kernel APIs.  (Not required
  for static functions, but OK there also.)  Use 'make htmldocs'
  or 'make mandocs' to check the kernel-doc and fix any issues.
11: Include kernel-doc to document global kernel APIs.  (Not required for
    static functions, but OK there also.) Use 'make htmldocs' or 'make
    mandocs' to check the kernel-doc and fix any issues.

- Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,
12: Has been tested with CONFIG_PREEMPT, CONFIG_DEBUG_PREEMPT,
    CONFIG_DEBUG_SLAB, CONFIG_DEBUG_PAGEALLOC, CONFIG_DEBUG_MUTEXES,
    CONFIG_DEBUG_SPINLOCK, CONFIG_DEBUG_SPINLOCK_SLEEP all simultaneously
    enabled.

- Has been build- and runtime tested with and without CONFIG_SMP and
13: Has been build- and runtime tested with and without CONFIG_SMP and
    CONFIG_PREEMPT.

- If the patch affects IO/Disk, etc: has been tested with and without
14: If the patch affects IO/Disk, etc: has been tested with and without
    CONFIG_LBD.

15: All codepaths have been exercised with all lockdep features enabled.

2006-APR-27
16: All new /proc entries are documented under Documentation/

17: All new kernel boot parameters are documented in
    Documentation/kernel-parameters.txt.

18: All new module parameters are documented with MODULE_PARM_DESC()
Loading