diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-25 12:45:40 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2014-03-25 12:45:40 -0300 |
| commit | 27cd560baa49d7eb685a5789cb915c5cdbdaf305 (patch) | |
| tree | 03f7fdcdfa62b05dd9793f2809c20d6357c991c0 /kernels/linux-libre-xen/criu-no-expert.patch | |
| parent | 88e1da204a82b0e8c0fa1a9e42ecd1b86a08eab8 (diff) | |
| parent | c86852f13787f259167b1df6d3762ef78980cad3 (diff) | |
Merge branch 'master' of vparabola:abslibre
Diffstat (limited to 'kernels/linux-libre-xen/criu-no-expert.patch')
| -rw-r--r-- | kernels/linux-libre-xen/criu-no-expert.patch | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/kernels/linux-libre-xen/criu-no-expert.patch b/kernels/linux-libre-xen/criu-no-expert.patch index 2124427e9..9bbc02812 100644 --- a/kernels/linux-libre-xen/criu-no-expert.patch +++ b/kernels/linux-libre-xen/criu-no-expert.patch @@ -1,8 +1,8 @@ diff --git a/init/Kconfig b/init/Kconfig -index be8b7f5..7461760 100644 +index 4e5d96a..4b94ffe 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -989,7 +989,7 @@ config DEBUG_BLK_CGROUP +@@ -1078,7 +1078,7 @@ config DEBUG_BLK_CGROUP endif # CGROUPS config CHECKPOINT_RESTORE @@ -11,12 +11,3 @@ index be8b7f5..7461760 100644 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 |