projects
/
GitHub
/
MotorolaMobilityLLC
/
kernel-slsi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
71998e8
b635ace
)
Merge branch 'linus' into x86/tracehook
author
Ingo Molnar
<mingo@elte.hu>
Fri, 15 Aug 2008 15:07:34 +0000
(17:07 +0200)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 15 Aug 2008 15:07:34 +0000
(17:07 +0200)
Conflicts:
arch/x86/Kconfig
Signed-off-by: Ingo Molnar <mingo@elte.hu>
1
2
arch/x86/Kconfig
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
arch/x86/Kconfig
index f463a8a3b21f429da7889a8274bb9f7c64605e5d,ac2fb0641a041e4a28055867140f458613673dc2..2206787b11576916fab2b46744e425d70590497d
---
1
/
arch/x86/Kconfig
---
2
/
arch/x86/Kconfig
+++ b/
arch/x86/Kconfig
@@@
-30,7
-29,7
+29,8
@@@
config X8
select HAVE_FTRACE
select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
select HAVE_ARCH_KGDB if !X86_VOYAGER
+ select HAVE_ARCH_TRACEHOOK
+ select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
config ARCH_DEFCONFIG