1 files changed, 15 insertions, 3 deletions

diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
index 86a4fe75f453..1a10d8ac8162 100755
--- a/scripts/link-vmlinux.sh
+++ b/scripts/link-vmlinux.sh
@@ -82,7 +82,7 @@ kallsyms()
                 kallsymopt="${kallsymopt} --all-symbols"
         fi
 
-        if [ -n "${CONFIG_ARM}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then
+        if [ -n "${CONFIG_ARM}" ] && [ -z "${CONFIG_XIP_KERNEL}" ] && [ -n "${CONFIG_PAGE_OFFSET}" ]; then
                 kallsymopt="${kallsymopt} --page-offset=$CONFIG_PAGE_OFFSET"
         fi
 
@@ -111,7 +111,6 @@ sortextable()
 }
 
 # Delete output files in case of error
-trap cleanup SIGHUP SIGINT SIGQUIT SIGTERM ERR
 cleanup()
 {
         rm -f .old_version
@@ -124,6 +123,20 @@ cleanup()
         rm -f vmlinux.o
 }
 
+on_exit()
+{
+        if [ $? -ne 0 ]; then
+                cleanup
+        fi
+}
+trap on_exit EXIT
+
+on_signals()
+{
+        exit 1
+}
+trap on_signals HUP INT QUIT TERM
+
 #
 #
 # Use "make V=1" to debug this script
@@ -231,7 +244,6 @@ if [ -n "${CONFIG_KALLSYMS}" ]; then
         if ! cmp -s System.map .tmp_System.map; then
                 echo >&2 Inconsistent kallsyms data
                 echo >&2 Try "make KALLSYMS_EXTRA_PASS=1" as a workaround
-                cleanup
                 exit 1
         fi
 fi