X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=b740e3dc9ff892797ab5c3b6770bd92654241165;hb=731af25b9890b3b9d73513d8973d1d5deaa4862f;hp=aa86b6ba7c93bccffed3ee8908d711c4c4bff26c;hpb=f4eedd99ec129e94de3cf8b10553ddf300a71d33;p=mirror_ubuntu-artful-kernel.git

diff --git a/Makefile b/Makefile
index aa86b6ba7c93..b740e3dc9ff8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 13
-SUBLEVEL = 8
+SUBLEVEL = 13
 EXTRAVERSION =
 NAME = Fearless Coyote
 
@@ -965,7 +965,11 @@ ifdef CONFIG_STACK_VALIDATION
   ifeq ($(has_libelf),1)
     objtool_target := tools/objtool FORCE
   else
-    $(warning "Cannot use CONFIG_STACK_VALIDATION, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+    ifdef CONFIG_UNWINDER_ORC
+      $(error "Cannot generate ORC metadata for CONFIG_UNWINDER_ORC=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+    else
+      $(warning "Cannot use CONFIG_STACK_VALIDATION=y, please install libelf-dev, libelf-devel or elfutils-libelf-devel")
+    endif
     SKIP_STACK_VALIDATION := 1
     export SKIP_STACK_VALIDATION
   endif