summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-06 15:57:24 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-06 15:57:24 -0800
commita15a82f42c5ee519d28f08c932803a9fd5168fc4 (patch)
treee50bfd8ea138e396842f1915260836928dfe6873 /Documentation
parent9144f3821d2cba9f16cdf3ff1b881384f4b68b53 (diff)
parent8d00450d296dedec9ada38d43b83e79cca6fd5a3 (diff)
downloadlinux-3.10-a15a82f42c5ee519d28f08c932803a9fd5168fc4.tar.gz
linux-3.10-a15a82f42c5ee519d28f08c932803a9fd5168fc4.tar.bz2
linux-3.10-a15a82f42c5ee519d28f08c932803a9fd5168fc4.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: Revert "x86: default to reboot via ACPI" x86: align DirectMap in /proc/meminfo AMD IOMMU: fix lazy IO/TLB flushing in unmap path x86: add smp_mb() before sending INVALIDATE_TLB_VECTOR x86: remove VISWS and PARAVIRT around NR_IRQS puzzle x86: mention ACPI in top-level Kconfig menu x86: size NR_IRQS on 32-bit systems the same way as 64-bit x86: don't allow nr_irqs > NR_IRQS x86/docs: remove noirqbalance param docs x86: don't use tsc_khz to calculate lpj if notsc is passed x86, voyager: fix smp_intr_init() compile breakage AMD IOMMU: fix detection of NP capable IOMMUs
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt2
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 8a8cb0ccc5f..c86c0745971 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1472,8 +1472,6 @@ and is between 256 and 4096 characters. It is defined in the file
Valid arguments: on, off
Default: on
- noirqbalance [X86-32,SMP,KNL] Disable kernel irq balancing
-
noirqdebug [X86-32] Disables the code which attempts to detect and
disable unhandled interrupt sources.