Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

13 files changed, 194 insertions, 124 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index 59620b1554e0..b0d067be7390 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -87,6 +87,11 @@ cc-ifversion = $(shell if [ $(call cc-version, $(CC)) $(1) $(2) ]; then \
 # $(Q)$(MAKE) $(build)=dir
 build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
 
+# Prefix -I with $(srctree) if it is not an absolute path
+addtree = $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
+# Find all -I options and call addtree
+flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
+
 # If quiet is set, only print short version of command
 cmd = @$(echo-cmd) $(cmd_$(1))
 
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 550798f57da5..2cb4935e85d1 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -99,11 +99,6 @@ __a_flags	= $(_a_flags)
 __cpp_flags     = $(_cpp_flags)
 else
 
-# Prefix -I with $(srctree) if it is not an absolute path
-addtree = $(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1)
-# Find all -I options and call addtree
-flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
-
 # -I$(obj) locates generated .h files
 # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
 #   and locates generated .h files
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter
index 75f21d843c1d..75f21d843c1d 100644..100755
--- a/scripts/bloat-o-meter
+++ b/scripts/bloat-o-meter
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index dadfa20ffec0..dadfa20ffec0 100644..100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 6d411169bfa6..56b3bed1108f 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -1,22 +1,55 @@
 #!/bin/bash
 # Copyright (C) Martin Schlemmer <azarah@nosferatu.za.org>
-# Released under the terms of the GNU GPL
-#
-# Generate a newline separated list of entries from the file/directory
-# supplied as an argument.
-#
-# If a file/directory is not supplied then generate a small dummy file.
+# Copyright (c) 2006           Sam Ravnborg <sam@ravnborg.org>
 #
-# The output is suitable for gen_init_cpio built from usr/gen_init_cpio.c.
+# Released under the terms of the GNU GPL
 #
+# Generate a cpio packed initramfs. It uses gen_init_cpio to generate
+# the cpio archive, and gzip to pack it.
+# The script may also be used to generate the inputfile used for gen_init_cpio
+# This script assumes that gen_init_cpio is located in usr/ directory
+
+# error out on errors
+set -e
+
+usage() {
+cat << EOF
+Usage:
+$0 [-o <file>] [-u <uid>] [-g <gid>] {-d | <cpio_source>} ...
+        -o <file>      Create gzipped initramfs file named <file> using
+                       gen_init_cpio and gzip
+        -u <uid>       User ID to map to user ID 0 (root).
+                       <uid> is only meaningful if <cpio_source>
+                       is a directory.
+        -g <gid>       Group ID to map to group ID 0 (root).
+                       <gid> is only meaningful if <cpio_source>
+                       is a directory.
+        <cpio_source>  File list or directory for cpio archive.
+                       If <cpio_source> is a .cpio file it will be used
+                       as direct input to initramfs.
+        -d             Output the default cpio list.
+
+All options except -o and -l may be repeated and are interpreted
+sequentially and immediately.  -u and -g states are preserved across
+<cpio_source> options so an explicit "-u 0 -g 0" is required
+to reset the root/group mapping.
+EOF
+}
+
+list_default_initramfs() {
+        # echo usr/kinit/kinit
+        :
+}
 
 default_initramfs() {
-        cat <<-EOF
+        cat <<-EOF >> ${output}
                 # This is a very simple, default initramfs
 
                 dir /dev 0755 0 0
                 nod /dev/console 0600 0 0 c 5 1
                 dir /root 0700 0 0
+                # file /kinit usr/kinit/kinit 0755 0 0
+                # slink /init kinit 0755 0 0
         EOF
 }
 
@@ -42,18 +75,28 @@ filetype() {
         return 0
 }
 
+list_print_mtime() {
+        :
+}
+
 print_mtime() {
-        local argv1="$1"
         local my_mtime="0"
 
-        if [ -e "${argv1}" ]; then
-                my_mtime=$(find "${argv1}" -printf "%T@\n" | sort -r | head -n 1)
+        if [ -e "$1" ]; then
+                my_mtime=$(find "$1" -printf "%T@\n" | sort -r | head -n 1)
         fi
-        
-        echo "# Last modified: ${my_mtime}"
-        echo
+
+        echo "# Last modified: ${my_mtime}" >> ${output}
+        echo "" >> ${output}
+}
+
+list_parse() {
+        echo "$1 \\"
 }
 
+# for each file print a line in following format
+# <filetype> <name> <path to file> <octal mode> <uid> <gid>
+# for links, devices etc the format differs. See gen_init_cpio for details
 parse() {
         local location="$1"
         local name="${location/${srcdir}//}"
@@ -99,80 +142,112 @@ parse() {
                         ;;
         esac
 
-        echo "${str}"
+        echo "${str}" >> ${output}
 
         return 0
 }
 
-usage() {
-        printf    "Usage:\n"
-        printf    "$0 [ [-u <root_uid>] [-g <root_gid>] [-d | <cpio_source>] ] . . .\n"
-        printf    "\n"
-        printf -- "-u <root_uid>  User ID to map to user ID 0 (root).\n"
-        printf    "               <root_uid> is only meaningful if <cpio_source>\n"
-        printf    "               is a directory.\n"
-        printf -- "-g <root_gid>  Group ID to map to group ID 0 (root).\n"
+unknown_option() {
+        printf "ERROR: unknown option \"$arg\"\n" >&2
+        printf "If the filename validly begins with '-', " >&2
+        printf "then it must be prefixed\n" >&2
+        printf "by './' so that it won't be interpreted as an option." >&2
+        printf "\n" >&2
+        usage >&2
+        exit 1