diff options
author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:59:11 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:59:11 -0500 |
commit | 4522d58275f124105819723e24e912c8e5bf3cdd (patch) | |
tree | b92c29014fadffe049c1925676037f0092b8d112 /Documentation/kernel-parameters.txt | |
parent | 6cf24f031bc97cb5a7c9df3b6e73c45b628b2b28 (diff) | |
parent | 64a26a731235b59c9d73bbe82c1f896d57400d37 (diff) |
Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (156 commits)
[PATCH] x86-64: Export smp_call_function_single
[PATCH] i386: Clean up smp_tune_scheduling()
[PATCH] unwinder: move .eh_frame to RODATA
[PATCH] unwinder: fully support linker generated .eh_frame_hdr section
[PATCH] x86-64: don't use set_irq_regs()
[PATCH] x86-64: check vector in setup_ioapic_dest to verify if need setup_IO_APIC_irq
[PATCH] x86-64: Make ix86 default to HIGHMEM4G instead of NOHIGHMEM
[PATCH] i386: replace kmalloc+memset with kzalloc
[PATCH] x86-64: remove remaining pc98 code
[PATCH] x86-64: remove unused variable
[PATCH] x86-64: Fix constraints in atomic_add_return()
[PATCH] x86-64: fix asm constraints in i386 atomic_add_return
[PATCH] x86-64: Correct documentation for bzImage protocol v2.05
[PATCH] x86-64: replace kmalloc+memset with kzalloc in MTRR code
[PATCH] x86-64: Fix numaq build error
[PATCH] x86-64: include/asm-x86_64/cpufeature.h isn't a userspace header
[PATCH] unwinder: Add debugging output to the Dwarf2 unwinder
[PATCH] x86-64: Clarify error message in GART code
[PATCH] x86-64: Fix interrupt race in idle callback (3rd try)
[PATCH] x86-64: Remove unwind stack pointer alignment forcing again
...
Fixed conflict in include/linux/uaccess.h manually
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 6b3c3e37a277..b79bcdf16319 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -599,8 +599,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
599 | 599 | ||
600 | hugepages= [HW,IA-32,IA-64] Maximal number of HugeTLB pages. | 600 | hugepages= [HW,IA-32,IA-64] Maximal number of HugeTLB pages. |
601 | 601 | ||
602 | noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing | ||
603 | |||
604 | i8042.direct [HW] Put keyboard port into non-translated mode | 602 | i8042.direct [HW] Put keyboard port into non-translated mode |
605 | i8042.dumbkbd [HW] Pretend that controller can only read data from | 603 | i8042.dumbkbd [HW] Pretend that controller can only read data from |
606 | keyboard and cannot control its state | 604 | keyboard and cannot control its state |
@@ -1065,9 +1063,14 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1065 | in certain environments such as networked servers or | 1063 | in certain environments such as networked servers or |
1066 | real-time systems. | 1064 | real-time systems. |
1067 | 1065 | ||
1066 | noirqbalance [IA-32,SMP,KNL] Disable kernel irq balancing | ||
1067 | |||
1068 | noirqdebug [IA-32] Disables the code which attempts to detect and | 1068 | noirqdebug [IA-32] Disables the code which attempts to detect and |
1069 | disable unhandled interrupt sources. | 1069 | disable unhandled interrupt sources. |
1070 | 1070 | ||
1071 | no_timer_check [IA-32,X86_64,APIC] Disables the code which tests for | ||
1072 | broken timer IRQ sources. | ||
1073 | |||
1071 | noisapnp [ISAPNP] Disables ISA PnP code. | 1074 | noisapnp [ISAPNP] Disables ISA PnP code. |
1072 | 1075 | ||
1073 | noinitrd [RAM] Tells the kernel not to load any configured | 1076 | noinitrd [RAM] Tells the kernel not to load any configured |
@@ -1752,6 +1755,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1752 | norandmaps Don't use address space randomization | 1755 | norandmaps Don't use address space randomization |
1753 | Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space | 1756 | Equivalent to echo 0 > /proc/sys/kernel/randomize_va_space |
1754 | 1757 | ||
1758 | unwind_debug=N N > 0 will enable dwarf2 unwinder debugging | ||
1759 | This is useful to get more information why | ||
1760 | you got a "dwarf2 unwinder stuck" | ||
1755 | 1761 | ||
1756 | ______________________________________________________________________ | 1762 | ______________________________________________________________________ |
1757 | 1763 | ||