Merge branch 'topic/pcsp-fix' into topic/misc

1 files changed, 12 insertions, 6 deletions

diff --git a/Makefile b/Makefile
index 16e3fbb968a8..7b1f2384094f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 VERSION = 2
 PATCHLEVEL = 6
-SUBLEVEL = 27
-EXTRAVERSION =
-NAME = Rotary Wombat
+SUBLEVEL = 28
+EXTRAVERSION = -rc6
+NAME = Killer Bat of Doom
 
 # *DOCUMENTATION*
 # To see a list of typical targets execute "make help"
@@ -437,7 +437,7 @@ ifeq ($(config-targets),1)
 # KBUILD_DEFCONFIG may point out an alternative default configuration
 # used for 'make defconfig'
 include $(srctree)/arch/$(SRCARCH)/Makefile
-export KBUILD_DEFCONFIG
+export KBUILD_DEFCONFIG KBUILD_KCONFIG
 
 config %config: scripts_basic outputmakefile FORCE
         $(Q)mkdir -p include/linux include/config
@@ -536,7 +536,7 @@ KBUILD_CFLAGS	+= -g
 KBUILD_AFLAGS   += -gdwarf-2
 endif
 
-ifdef CONFIG_FTRACE
+ifdef CONFIG_FUNCTION_TRACER
 KBUILD_CFLAGS   += -pg
 endif
 
@@ -961,6 +961,7 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
 
 # The asm symlink changes when $(ARCH) changes.
 # Detect this and ask user to run make mrproper
+# If asm is a stale symlink (point to dir that does not exist) remove it
 define check-symlink
         set -e;                                                            \
         if [ -L include/asm ]; then                                        \
@@ -970,6 +971,10 @@ define check-symlink
                         echo "       set ARCH or save .config and run 'make mrproper' to fix it";             \
                         exit 1;                                            \
                 fi;                                                        \
+                test -e $$asmlink || rm include/asm;                       \
+        elif [ -d include/asm ]; then                                      \
+                echo "ERROR: $@ is a directory but a symlink was expected";\
+                exit 1;                                                    \
         fi
 endef
 
@@ -1431,7 +1436,8 @@ ALLSOURCE_ARCHS := $(SRCARCH)
 define find-sources
         ( for arch in $(ALLSOURCE_ARCHS) ; do \
                find $(__srctree)arch/$${arch} $(RCS_FIND_IGNORE) \
-                    -name $1 -print; \
+                    -wholename $(__srctree)arch/$${arch}/include/asm -type d -prune \
+                    -o -name $1 -print; \
           done ; \
           find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
                -name $1 -print; \