powerpc/book3s64/radix: Rename CPU_FTR_P9_TLBIE_BUG feature flag

[linux-2.6-block.git] / Makefile

diff --git a/Makefile b/Makefile
index adc0cabe23828366775b02a355c9dbf01a2b07ae..656a8c95789df7bd9206a9bd6c710855546c0252 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 5
 PATCHLEVEL = 3
 SUBLEVEL = 0
-EXTRAVERSION = -rc4
+EXTRAVERSION =
 NAME = Bobtail Squid
 
 # *DOCUMENTATION*
@@ -933,6 +933,10 @@ ifeq ($(CONFIG_STRIP_ASM_SYMS),y)
 LDFLAGS_vmlinux        += $(call ld-option, -X,)
 endif
 
+ifeq ($(CONFIG_RELR),y)
+LDFLAGS_vmlinux        += --pack-dyn-relocs=relr
+endif
+
 # insure the checker run with the right endianness
 CHECKFLAGS += $(if $(CONFIG_CPU_BIG_ENDIAN),-mbig-endian,-mlittle-endian)
 
@@ -1504,8 +1508,10 @@ help:
        @echo  ''
        @$(if $(dtstree), \
                echo 'Devicetree:'; \
-               echo '* dtbs            - Build device tree blobs for enabled boards'; \
-               echo '  dtbs_install    - Install dtbs to $(INSTALL_DTBS_PATH)'; \
+               echo '* dtbs             - Build device tree blobs for enabled boards'; \
+               echo '  dtbs_install     - Install dtbs to $(INSTALL_DTBS_PATH)'; \
+               echo '  dt_binding_check - Validate device tree binding documents'; \
+               echo '  dtbs_check       - Validate device tree source files';\
                echo '')
 
        @echo 'Userspace tools targets:'