- disabled CONFIG_STACK_VALIDATION, it's only usefull on debug,

  frame-pointer enabled builds
- rel 3

diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index def5704e9745c3f4b10a0bf80df85e0635911788..0d855f9c67eecac410fd25051574ba7d55634b94 100644 (file)
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -9261,7 +9261,7 @@ HEADERS_CHECK all=y
 DEBUG_SECTION_MISMATCH all=n
 SECTION_MISMATCH_WARN_ONLY all=y
 FRAME_POINTER i386=y x86_64=y
-STACK_VALIDATION all=y
+STACK_VALIDATION all=n
 DEBUG_FORCE_WEAK_PER_CPU all=n
 MAGIC_SYSRQ all=y
 MAGIC_SYSRQ_DEFAULT_ENABLE all=0x1

diff --git a/kernel.spec b/kernel.spec
index d28a55e364769f5fb0f6b66cff7fc2e3c5c19a7e..4374a038c2e34648cea031c57a33116da188bc1c 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@
 %define                have_pcmcia     0
 %endif
 
-%define                rel             2
+%define                rel             3
 %define                basever         4.6
 %define                postver         .1
 
@@ -1048,11 +1048,6 @@ for dir in $(cd %{objdir} && find arch -name generated -type d); do
        find $RPM_BUILD_ROOT%{_kernelsrcdir}/$dir -name '.*.cmd' -exec rm "{}" ";"
 done
 
-# Needed for CONFIG_STACK_VALIDATION enabled builds
-install -d $RPM_BUILD_ROOT%{_kernelsrcdir}/tools/objtool
-cp -a %{objdir}/tools/objtool/fixdep $RPM_BUILD_ROOT%{_kernelsrcdir}/tools/objtool
-cp -a %{objdir}/tools/objtool/objtool $RPM_BUILD_ROOT%{_kernelsrcdir}/tools/objtool
-
 # version.h location changed in 3.7, but a lot of external modules don't know about it
 # add a compatibility symlink
 ln -s ../generated/uapi/linux/version.h $RPM_BUILD_ROOT%{_kernelsrcdir}/include/linux/version.h
@@ -1473,8 +1468,6 @@ fi
 %{_kernelsrcdir}/scripts/selinux/mdp/*.c
 %exclude %dir %{_kernelsrcdir}/security
 %exclude %dir %{_kernelsrcdir}/security/selinux
-%attr(755,root,root) %{_kernelsrcdir}/tools/objtool/fixdep
-%attr(755,root,root) %{_kernelsrcdir}/tools/objtool/objtool
 
 %if %{with doc}
 %files doc
@@ -1554,8 +1547,6 @@ fi
 %{_kernelsrcdir}/security
 %exclude %{_kernelsrcdir}/security/selinux/include
 %{_kernelsrcdir}/tools/*
-%exclude %{_kernelsrcdir}/tools/objtool/fixdep
-%exclude %{_kernelsrcdir}/tools/objtool/objtool
 %{_kernelsrcdir}/usr
 %{_kernelsrcdir}/COPYING
 %{_kernelsrcdir}/CREDITS