Merge branch 'linus' into x86/memtest

1 files changed, 14 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 31729a9387df..2c7e8e87f770 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -48,6 +48,20 @@ do
                 fi
         done
 
+        # ignore register save/restore funcitons
+        if [ "${UNDEF:0:9}" = "_restgpr_" ]; then
+                OK=1
+        fi
+        if [ "${UNDEF:0:11}" = "_rest32gpr_" ]; then
+                OK=1
+        fi
+        if [ "${UNDEF:0:9}" = "_savegpr_" ]; then
+                OK=1
+        fi
+        if [ "${UNDEF:0:11}" = "_save32gpr_" ]; then
+                OK=1
+        fi
+
         if [ $OK -eq 0 ]; then
                 ERROR=1
                 echo "Error: External symbol '$UNDEF' referenced" \