diff options
| -rw-r--r-- | config-generic | 2 | ||||
| -rw-r--r-- | config-nodebug | 2 | ||||
| -rw-r--r-- | config-x86_64-generic | 4 | ||||
| -rw-r--r-- | criu-no-expert.patch | 22 | ||||
| -rw-r--r-- | kernel.spec | 13 | ||||
| -rw-r--r-- | sources | 2 |
6 files changed, 42 insertions, 3 deletions
diff --git a/config-generic b/config-generic index e06358190..3cb093051 100644 --- a/config-generic +++ b/config-generic @@ -54,6 +54,8 @@ CONFIG_IOSCHED_DEADLINE=y CONFIG_IOSCHED_CFQ=y CONFIG_CFQ_GROUP_IOSCHED=y CONFIG_DEFAULT_CFQ=y +# CONFIG_CHECKPOINT_RESTORE is not set +# CONFIG_NAMESPACES is not set CONFIG_PID_NS=y CONFIG_UTS_NS=y CONFIG_IPC_NS=y diff --git a/config-nodebug b/config-nodebug index afc6fabc7..ee71f8577 100644 --- a/config-nodebug +++ b/config-nodebug @@ -2,7 +2,7 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y -# CONFIG_DEBUG_ATOMIC_SLEEP is not set +CONFIG_DEBUG_ATOMIC_SLEEP=y # CONFIG_DEBUG_MUTEXES is not set # CONFIG_DEBUG_RT_MUTEXES is not set diff --git a/config-x86_64-generic b/config-x86_64-generic index bcea67e2a..575564345 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -127,6 +127,10 @@ CONFIG_I7300_IDLE=m CONFIG_BPF_JIT=y +# https://fedoraproject.org/wiki/Features/Checkpoint_Restore +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_NAMESPACES=y + # Should be 32bit only, but lacks KConfig depends # CONFIG_XO15_EBOOK is not set diff --git a/criu-no-expert.patch b/criu-no-expert.patch new file mode 100644 index 000000000..2124427e9 --- /dev/null +++ b/criu-no-expert.patch @@ -0,0 +1,22 @@ +diff --git a/init/Kconfig b/init/Kconfig +index be8b7f5..7461760 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP + endif # CGROUPS + + config CHECKPOINT_RESTORE +- bool "Checkpoint/restore support" if EXPERT ++ bool "Checkpoint/restore support" + default n + help + Enables additional kernel features in a sake of checkpoint/restore. +@@ -1000,7 +1000,7 @@ config CHECKPOINT_RESTORE + If unsure, say N here. + + menuconfig NAMESPACES +- bool "Namespaces support" if EXPERT ++ bool "Namespaces support" + default !EXPERT + help + Provides the way to make tasks work with different objects using diff --git a/kernel.spec b/kernel.spec index 482dbdb87..79e2ff89e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 5 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -751,6 +751,9 @@ Patch21229: Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch Patch21240: Input-increase-struct-ps2dev-cmdbuf-to-8-bytes.patch Patch21241: Input-add-support-for-Cypress-PS2-Trackpads.patch +# https://fedoraproject.org/wiki/Features/Checkpoint_Restore +Patch21242: criu-no-expert.patch + # END OF PATCH DEFINITIONS %endif @@ -1448,6 +1451,9 @@ ApplyPatch Revert-iwlwifi-fix-the-reclaimed-packet-tracking-upon.patch ApplyPatch Input-increase-struct-ps2dev-cmdbuf-to-8-bytes.patch ApplyPatch Input-add-support-for-Cypress-PS2-Trackpads.patch +# https://fedoraproject.org/wiki/Features/Checkpoint_Restore +ApplyPatch criu-no-expert.patch + # END OF PATCH APPLICATIONS %endif @@ -2303,6 +2309,11 @@ fi # ||----w | # || || %changelog +* Wed Jan 30 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc5.git2.1 +- Linux v3.8-rc5-218-ga56e160 +- Enable NAMESPACES and CHECKPOINT_RESTORE on x86_64 for F19 CRIU feature +- Enable CONFIG_DEBUG_ATOMIC_SLEEP + * Tue Jan 29 2013 Josh Boyer <jwboyer@redhat.com> - 3.8.0-0.rc5.git1.1 - Linux v3.8-rc5-150-g6abb7c2 @@ -1,3 +1,3 @@ 21223369d682bcf44bcdfe1521095983 linux-3.7.tar.xz 714424b01630b141bbee02d0ea9d5633 patch-3.8-rc5.xz -4321224a98ba68c550602eb06b3bf059 patch-3.8-rc5-git1.xz +bbee7c088c5023d79b661a9547379ff7 patch-3.8-rc5-git2.xz |