diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-01-13 00:33:16 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-01-13 00:33:16 +0300 |
| commit | 7bfb8575b82cd1facde3dc5be2b125f408171646 (patch) | |
| tree | 9df1049fe7491df41efe02109b7192334881176c /lib | |
| parent | 6c869d301bda3f672f001e2c9fcb01685000fc83 (diff) | |
| parent | 61864d844c296933d40c02683252bbea5193b101 (diff) | |
| download | linux-7bfb8575b82cd1facde3dc5be2b125f408171646.tar.xz | |
Merge branch 'topic/line6' into for-next
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Kconfig.kgdb | 25 | ||||
| -rw-r--r-- | lib/assoc_array.c | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/lib/Kconfig.kgdb b/lib/Kconfig.kgdb index 358eb81fa28d..c635a107a7de 100644 --- a/lib/Kconfig.kgdb +++ b/lib/Kconfig.kgdb @@ -73,6 +73,31 @@ config KGDB_KDB help KDB frontend for kernel +config KDB_DEFAULT_ENABLE + hex "KDB: Select kdb command functions to be enabled by default" + depends on KGDB_KDB + default 0x1 + help + Specifiers which kdb commands are enabled by default. This may + be set to 1 or 0 to enable all commands or disable almost all + commands. + + Alternatively the following bitmask applies: + + 0x0002 - allow arbitrary reads from memory and symbol lookup + 0x0004 - allow arbitrary writes to memory + 0x0008 - allow current register state to be inspected + 0x0010 - allow current register state to be modified + 0x0020 - allow passive inspection (backtrace, process list, lsmod) + 0x0040 - allow flow control management (breakpoint, single step) + 0x0080 - enable signalling of processes + 0x0100 - allow machine to be rebooted + + The config option merely sets the default at boot time. Both + issuing 'echo X > /sys/module/kdb/parameters/cmd_enable' or + setting with kdb.cmd_enable=X kernel command line option will + override the default settings. + config KDB_KEYBOARD bool "KGDB_KDB: keyboard as input device" depends on VT && KGDB_KDB diff --git a/lib/assoc_array.c b/lib/assoc_array.c index 2404d03e251a..03dd576e6773 100644 --- a/lib/assoc_array.c +++ b/lib/assoc_array.c @@ -11,6 +11,7 @@ * 2 of the Licence, or (at your option) any later version. */ //#define DEBUG +#include <linux/rcupdate.h> #include <linux/slab.h> #include <linux/err.h> #include <linux/assoc_array_priv.h> |