X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Makefile;h=fd31364274754372fe7f46e47756cfe7fc240bdc;hb=de5594ae40a34151754190e229f43535518564e7;hp=7c134acfd0a093394588dd2c4cc8d726f8c62f42;hpb=739853f0d9cb505ee7896eeb9919c2ca1724a07d;p=mirror_ubuntu-artful-kernel.git

diff --git a/Makefile b/Makefile
index 7c134acfd0a0..fd3136427475 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 13
-SUBLEVEL = 10
+SUBLEVEL = 16
 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