From f8edfeb3e69cdfd9e136789e7db001f894f3b2c5 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Mon, 3 Aug 2015 11:56:14 +0000 Subject: [PATCH] - updated to 3.10.84 --- kernel-vanilla-x86.config | 10 +++++++--- kernel-vanilla-x86_64.config | 9 ++++++--- kernel-vanilla.spec | 4 ++-- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/kernel-vanilla-x86.config b/kernel-vanilla-x86.config index 637d160..b7f0bb7 100644 --- a/kernel-vanilla-x86.config +++ b/kernel-vanilla-x86.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-3.10-vanilla Kernel Configuration +# Linux/x86 3.10.84-3.10-vanilla Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -327,6 +327,7 @@ CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -420,6 +421,8 @@ CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y CONFIG_VM86=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX32=y CONFIG_TOSHIBA=m CONFIG_I8K=m CONFIG_X86_REBOOTFIXUPS=y @@ -509,7 +512,8 @@ CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set # CONFIG_KEXEC_JUMP is not set CONFIG_PHYSICAL_START=0x1000000 -# CONFIG_RELOCATABLE is not set +CONFIG_RELOCATABLE=y +CONFIG_X86_NEED_RELOCS=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set @@ -2205,6 +2209,7 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -5888,7 +5893,6 @@ CONFIG_DMA_ACPI=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y CONFIG_DMATEST=m CONFIG_DCA=m diff --git a/kernel-vanilla-x86_64.config b/kernel-vanilla-x86_64.config index 948102a..5b919d4 100644 --- a/kernel-vanilla-x86_64.config +++ b/kernel-vanilla-x86_64.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.10.0-3.10-vanilla Kernel Configuration +# Linux/x86 3.10.84-3.10-vanilla Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -333,6 +333,7 @@ CONFIG_INLINE_READ_UNLOCK=y CONFIG_INLINE_READ_UNLOCK_IRQ=y CONFIG_INLINE_WRITE_UNLOCK=y CONFIG_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_FREEZER=y @@ -402,6 +403,8 @@ CONFIG_X86_MCE_AMD=y CONFIG_X86_MCE_THRESHOLD=y # CONFIG_X86_MCE_INJECT is not set CONFIG_X86_THERMAL_VECTOR=y +CONFIG_X86_16BIT=y +CONFIG_X86_ESPFIX64=y CONFIG_I8K=m CONFIG_MICROCODE=m CONFIG_MICROCODE_INTEL=y @@ -491,7 +494,7 @@ CONFIG_KEXEC=y # CONFIG_CRASH_DUMP is not set # CONFIG_KEXEC_JUMP is not set CONFIG_PHYSICAL_START=0x1000000 -# CONFIG_RELOCATABLE is not set +CONFIG_RELOCATABLE=y CONFIG_PHYSICAL_ALIGN=0x1000000 CONFIG_HOTPLUG_CPU=y # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set @@ -2104,6 +2107,7 @@ CONFIG_BCACHE=m # CONFIG_BCACHE_DEBUG is not set # CONFIG_BCACHE_EDEBUG is not set # CONFIG_BCACHE_CLOSURES_DEBUG is not set +CONFIG_BLK_DEV_DM_BUILTIN=y CONFIG_BLK_DEV_DM=m # CONFIG_DM_DEBUG is not set CONFIG_DM_BUFIO=m @@ -5653,7 +5657,6 @@ CONFIG_DMA_ACPI=y # # DMA Clients # -CONFIG_NET_DMA=y CONFIG_ASYNC_TX_DMA=y CONFIG_DMATEST=m CONFIG_DCA=m diff --git a/kernel-vanilla.spec b/kernel-vanilla.spec index 7a328f9..cb135b9 100644 --- a/kernel-vanilla.spec +++ b/kernel-vanilla.spec @@ -4,7 +4,7 @@ %bcond_with verbose # verbose build (V=1) %define basever 3.10 -%define postver 67 +%define postver 84 %define rel 1 %define alt_kernel 3.10-vanilla @@ -30,7 +30,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz # Source0-md5: 4f25cd5bec5f8d5a7d935b3f2ccb8481 %if "%{postver}" != "0" Source1: http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.xz -# Source1-md5: dd9624f24c3656f53d9da6219db7e61e +# Source1-md5: 80a327cd3bc02259a7faf698352b0072 %endif Source2: kernel.sysconfig -- 2.46.0