2 files changed, 33 insertions, 3 deletions

diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt
index f3355b6812df..bb3bf38f03da 100644
--- a/Documentation/kbuild/kbuild.txt
+++ b/Documentation/kbuild/kbuild.txt
@@ -65,6 +65,22 @@ INSTALL_PATH
 INSTALL_PATH specifies where to place the updated kernel and system map
 images. Default is /boot, but you can set it to other values.
 
+INSTALLKERNEL
+--------------------------------------------------
+Install script called when using "make install".
+The default name is "installkernel".
+
+The script will be called with the following arguments:
+    $1 - kernel version
+    $2 - kernel image file
+    $3 - kernel map file
+    $4 - default install path (use root directory if blank)
+
+The implmentation of "make install" is architecture specific
+and it may differ from the above.
+
+INSTALLKERNEL is provided to enable the possibility to
+specify a custom installer when cross compiling a kernel.
 
 MODLIB
 --------------------------------------------------
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index d76cfd8712e1..71c602d61680 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -18,6 +18,7 @@ This document describes the Linux kernel Makefiles.
            --- 3.9 Dependency tracking
            --- 3.10 Special Rules
            --- 3.11 $(CC) support functions
+           --- 3.12 $(LD) support functions
 
         === 4 Host Program support
            --- 4.1 Simple Host Program
@@ -435,14 +436,14 @@ more details, with real examples.
         The second argument is optional, and if supplied will be used
         if first argument is not supported.
 
-    ld-option
-        ld-option is used to check if $(CC) when used to link object files
+    cc-ldoption
+        cc-ldoption is used to check if $(CC) when used to link object files
         supports the given option.  An optional second option may be
         specified if first option are not supported.
 
         Example:
                 #arch/i386/kernel/Makefile
-                vsyscall-flags += $(call ld-option, -Wl$(comma)--hash-style=sysv)
+                vsyscall-flags += $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
 
         In the above example, vsyscall-flags will be assigned the option
         -Wl$(comma)--hash-style=sysv if it is supported by $(CC).
@@ -570,6 +571,19 @@ more details, with real examples.
                         endif
                 endif
 
+--- 3.12 $(LD) support functions
+
+    ld-option
+        ld-option is used to check if $(LD) supports the supplied option.
+        ld-option takes two options as arguments.
+        The second argument is an optional option that can be used if the
+        first option is not supported by $(LD).
+
+        Example:
+                #Makefile
+                LDFLAGS_vmlinux += $(call really-ld-option, -X)
+
+
 === 4 Host Program support
 
 Kbuild supports building executables on the host for use during the