diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
| commit | 59e52534172d845ebffb0d7e85fc56fb7b857051 (patch) | |
| tree | 49552e03f1bdb413cd8b5f7542e91770688d7047 /Documentation/networking | |
| parent | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff) | |
| parent | 0d89e54c8249645404283436d952afc261a04e1e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
MAINTAINERS: linux-m32r is moderated for non-subscribers
linux@lists.openrisc.net is moderated for non-subscribers
Drop default from "DM365 codec select" choice
parisc: Kconfig: cleanup Kernel page size default
Kconfig: remove redundant CONFIG_ prefix on two symbols
cris: remove arch/cris/arch-v32/lib/nand_init.S
microblaze: add missing CONFIG_ prefixes
h8300: drop puzzling Kconfig dependencies
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
tty: drop superfluous dependency in Kconfig
ARM: mxc: fix Kconfig typo 'i.MX51'
Fix file references in Kconfig files
aic7xxx: fix Kconfig references to READMEs
Fix file references in drivers/ide/
thinkpad_acpi: Fix printk typo 'bluestooth'
bcmring: drop commented out line in Kconfig
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
doc: raw1394: Trivial typo fix
CIFS: Don't free volume_info->UNC until we are entirely done with it.
treewide: Correct spelling of successfully in comments
...
Diffstat (limited to 'Documentation/networking')
| -rw-r--r-- | Documentation/networking/scaling.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/networking/scaling.txt b/Documentation/networking/scaling.txt index fe67b5c79f0f..a177de21d28e 100644 --- a/Documentation/networking/scaling.txt +++ b/Documentation/networking/scaling.txt | |||
| @@ -73,7 +73,7 @@ of queues to IRQs can be determined from /proc/interrupts. By default, | |||
| 73 | an IRQ may be handled on any CPU. Because a non-negligible part of packet | 73 | an IRQ may be handled on any CPU. Because a non-negligible part of packet |
| 74 | processing takes place in receive interrupt handling, it is advantageous | 74 | processing takes place in receive interrupt handling, it is advantageous |
| 75 | to spread receive interrupts between CPUs. To manually adjust the IRQ | 75 | to spread receive interrupts between CPUs. To manually adjust the IRQ |
| 76 | affinity of each interrupt see Documentation/IRQ-affinity. Some systems | 76 | affinity of each interrupt see Documentation/IRQ-affinity.txt. Some systems |
| 77 | will be running irqbalance, a daemon that dynamically optimizes IRQ | 77 | will be running irqbalance, a daemon that dynamically optimizes IRQ |
| 78 | assignments and as a result may override any manual settings. | 78 | assignments and as a result may override any manual settings. |
| 79 | 79 | ||