projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
x86_64
/
Kconfig
diff --git
a/arch/x86_64/Kconfig
b/arch/x86_64/Kconfig
index
bfbb9bc
..
d427553
100644
(file)
--- a/
arch/x86_64/Kconfig
+++ b/
arch/x86_64/Kconfig
@@
-96,6
+96,19
@@
config AUDIT_ARCH
bool
default y
bool
default y
+config GENERIC_BUG
+ bool
+ default y
+ depends on BUG
+
+config ARCH_HAS_ILOG2_U32
+ bool
+ default n
+
+config ARCH_HAS_ILOG2_U64
+ bool
+ default n
+
source "init/Kconfig"
source "init/Kconfig"
@@
-571,7
+584,7
@@
config SECCOMP
If unsure, say Y. Only embedded should say N here.
config CC_STACKPROTECTOR
If unsure, say Y. Only embedded should say N here.
config CC_STACKPROTECTOR
- bool "Enable -fstack-protector buffer overflow detection (EXPRIMENTAL)"
+ bool "Enable -fstack-protector buffer overflow detection (EXP
E
RIMENTAL)"
depends on EXPERIMENTAL
help
This option turns on the -fstack-protector GCC feature. This
depends on EXPERIMENTAL
help
This option turns on the -fstack-protector GCC feature. This