From: Jeff Mahoney Date: Mon, 7 May 2012 17:54:14 +0000 (-0400) Subject: - Update to 3.4-rc6. X-Git-Url: http://git.alex.org.uk - Update to 3.4-rc6. - Eliminated 2 patches. suse-commit: 749ea8f9e366dea70a04e209ba5339498625745f --- d5ac6b9eabc0555710a90890bc138e55117e99ca diff --cc arch/x86/Kconfig index 1f713fd,c9866b0..e2732a5 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@@ -78,10 -78,10 +78,10 @@@ config X8 select IRQ_FORCED_THREADING select USE_GENERIC_SMP_HELPERS if SMP select HAVE_BPF_JIT if (X86_64 && NET) - select CLKEVT_I8253 + select CLKEVT_I8253 if !XEN select ARCH_HAVE_NMI_SAFE_CMPXCHG select GENERIC_IOMAP - select DCACHE_WORD_ACCESS if !DEBUG_PAGEALLOC + select DCACHE_WORD_ACCESS config INSTRUCTION_DECODER def_bool (KPROBES || PERF_EVENTS)