diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:46:07 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 20:46:07 -0400 |
commit | 094803e0aab3fe75bbf8202a8f4b5280eaade375 (patch) | |
tree | 278528ca9245a767fcfcfa97d977bd5714c082fd /Documentation/kernel-parameters.txt | |
parent | 32087d4eeca14b82660dab288b1d659963b954bd (diff) | |
parent | d8805e633e054c816c47cb6e727c81f156d9253d (diff) |
Merge branch 'akpm' (Andrew's incoming)
Quoth Andrew:
- Most of MM. Still waiting for the poweroc guys to get off their
butts and review some threaded hugepages patches.
- alpha
- vfs bits
- drivers/misc
- a few core kerenl tweaks
- printk() features
- MAINTAINERS updates
- backlight merge
- leds merge
- various lib/ updates
- checkpatch updates
* akpm: (127 commits)
epoll: fix spurious lockdep warnings
checkpatch: add a --strict check for utf-8 in commit logs
kernel.h/checkpatch: mark strict_strto<foo> and simple_strto<foo> as obsolete
llist-return-whether-list-is-empty-before-adding-in-llist_add-fix
wireless: at76c50x: follow rename pack_hex_byte to hex_byte_pack
fat: follow rename pack_hex_byte() to hex_byte_pack()
security: follow rename pack_hex_byte() to hex_byte_pack()
kgdb: follow rename pack_hex_byte() to hex_byte_pack()
lib: rename pack_hex_byte() to hex_byte_pack()
lib/string.c: fix strim() semantics for strings that have only blanks
lib/idr.c: fix comment for ida_get_new_above()
lib/percpu_counter.c: enclose hotplug only variables in hotplug ifdef
lib/bitmap.c: quiet sparse noise about address space
lib/spinlock_debug.c: print owner on spinlock lockup
lib/kstrtox: common code between kstrto*() and simple_strto*() functions
drivers/leds/leds-lp5521.c: check if reset is successful
leds: turn the blink_timer off before starting to blink
leds: save the delay values after a successful call to blink_set()
drivers/leds/leds-gpio.c: use gpio_get_value_cansleep() when initializing
drivers/leds/leds-lm3530.c: add __devexit_p where needed
...
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 661efd4dab6b..a0c5c5f4fce6 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -973,6 +973,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
973 | ignore_loglevel [KNL] | 973 | ignore_loglevel [KNL] |
974 | Ignore loglevel setting - this will print /all/ | 974 | Ignore loglevel setting - this will print /all/ |
975 | kernel messages to the console. Useful for debugging. | 975 | kernel messages to the console. Useful for debugging. |
976 | We also add it as printk module parameter, so users | ||
977 | could change it dynamically, usually by | ||
978 | /sys/module/printk/parameters/ignore_loglevel. | ||
976 | 979 | ||
977 | ihash_entries= [KNL] | 980 | ihash_entries= [KNL] |
978 | Set number of hash buckets for inode cache. | 981 | Set number of hash buckets for inode cache. |
@@ -1666,6 +1669,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
1666 | debugging driver suspend/resume hooks). This may | 1669 | debugging driver suspend/resume hooks). This may |
1667 | not work reliably with all consoles, but is known | 1670 | not work reliably with all consoles, but is known |
1668 | to work with serial and VGA consoles. | 1671 | to work with serial and VGA consoles. |
1672 | To facilitate more flexible debugging, we also add | ||
1673 | console_suspend, a printk module parameter to control | ||
1674 | it. Users could use console_suspend (usually | ||
1675 | /sys/module/printk/parameters/console_suspend) to | ||
1676 | turn on/off it dynamically. | ||
1669 | 1677 | ||
1670 | noaliencache [MM, NUMA, SLAB] Disables the allocation of alien | 1678 | noaliencache [MM, NUMA, SLAB] Disables the allocation of alien |
1671 | caches in the slab allocator. Saves per-node memory, | 1679 | caches in the slab allocator. Saves per-node memory, |