projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Add build option to to set the default panic timeout."
[firefly-linux-kernel-4.4.55.git]
/
init
/
Kconfig
diff --git
a/init/Kconfig
b/init/Kconfig
index ab5c64801fe50ab21dc3ae7db263f5f19a99ad56..714597c6f8426c85227892c1b1c9eabdd42bf0e1 100644
(file)
--- a/
init/Kconfig
+++ b/
init/Kconfig
@@
-117,6
+117,7
@@
config HAVE_KERNEL_LZMA
choice
prompt "Kernel compression mode"
choice
prompt "Kernel compression mode"
+ default KERNEL_LZO if ARCH_RK29
default KERNEL_GZIP
depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
help
default KERNEL_GZIP
depends on HAVE_KERNEL_GZIP || HAVE_KERNEL_BZIP2 || HAVE_KERNEL_LZMA
help
@@
-606,7
+607,7
@@
config SYSFS_DEPRECATED
bool
config SYSFS_DEPRECATED_V2
bool
config SYSFS_DEPRECATED_V2
- bool "
remove
sysfs features which may confuse old userspace tools"
+ bool "
enable deprecated
sysfs features which may confuse old userspace tools"
depends on SYSFS
default n
select SYSFS_DEPRECATED
depends on SYSFS
default n
select SYSFS_DEPRECATED
@@
-1098,12
+1099,12
@@
config SLOW_WORK
See Documentation/slow-work.txt.
See Documentation/slow-work.txt.
-config SLOW_WORK_
PROC
- bool "Slow work debugging through
/proc
"
+config SLOW_WORK_
DEBUG
+ bool "Slow work debugging through
debugfs
"
default n
default n
- depends on SLOW_WORK &&
PROC
_FS
+ depends on SLOW_WORK &&
DEBUG
_FS
help
help
- Display the contents of the slow work run queue through
/proc
,
+ Display the contents of the slow work run queue through
debugfs
,
including items currently executing.
See Documentation/slow-work.txt.
including items currently executing.
See Documentation/slow-work.txt.