Merge branch 'linus' into test

Conflicts: MAINTAINERS arch/x86/kernel/acpi/boot.c arch/x86/kernel/acpi/sleep.c drivers/acpi/Kconfig drivers/pnp/Makefile drivers/pnp/quirks.c Signed-off-by: Len Brown <len.brown@intel.com>
author: Len Brown <len.brown@intel.com> 2008-10-22 23:57:26 -0400
committer: Len Brown <len.brown@intel.com> 2008-10-23 00:11:07 -0400
commit: 057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch)
tree: 4333e608da237c73ff69b10878025cca96dcb4c8 /scripts
parent: 3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff)
parent: 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff)
20 files changed, 1332 insertions, 112 deletions
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index d64e6badc942..982dcae7bbe2 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -105,12 +105,12 @@ as-instr = $(call try-run,\
 # Usage: cflags-y += $(call cc-option,-march=winchip-c6,-march=i586)
 cc-option = $(call try-run,\
-        $(CC) $(KBUILD_CFLAGS) $(1) -S -xc /dev/null -o "$$TMP",$(1),$(2))
+        $(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",$(1),$(2))
 # cc-option-yn
 # Usage: flag := $(call cc-option-yn,-march=winchip-c6)
 cc-option-yn = $(call try-run,\
-        $(CC) $(KBUILD_CFLAGS) $(1) -S -xc /dev/null -o "$$TMP",y,n)
+        $(CC) $(KBUILD_CFLAGS) $(1) -c -xc /dev/null -o "$$TMP",y,n)
 # cc-option-align
 # Prefix align with either -falign or -malign
diff --git a/scripts/Makefile b/scripts/Makefile
index 1c73c5aea66b..aafdf064feef 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -20,6 +20,7 @@ hostprogs-y += unifdef
 subdir-$(CONFIG_MODVERSIONS) += genksyms
 subdir-y                     += mod
+subdir-$(CONFIG_SECURITY_SELINUX) += selinux
 # Let clean descend into subdirs
-subdir- += basic kconfig package
+subdir- += basic kconfig package selinux
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 277cfe0b7100..5ed4cbf1e0e1 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -198,10 +198,17 @@ cmd_modversions =							\
        fi;
 endif
+ifdef CONFIG_FTRACE_MCOUNT_RECORD
+cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl \
+        "$(ARCH)" "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" \
+        "$(MV)" "$(@)";
+endif
 define rule_cc_o_c
        $(call echo-cmd,checksrc) $(cmd_checksrc)                         \
        $(call echo-cmd,cc_o_c) $(cmd_cc_o_c);                            \
        $(cmd_modversions)                                                \
+        $(cmd_record_mcount)                                              \
        scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' >    \
                                                      $(dot-target).tmp;  \
        rm -f $(depfile);                                                 \
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index ea48b82a3707..b4ca38a21158 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -96,6 +96,14 @@ basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
 modname_flags  = $(if $(filter 1,$(words $(modname))),\
                 -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
+#hash values
+ifdef CONFIG_DYNAMIC_PRINTK_DEBUG
+debug_flags = -D"DEBUG_HASH=$(shell ./scripts/basic/hash djb2 $(@D)$(modname))"\
+              -D"DEBUG_HASH2=$(shell ./scripts/basic/hash r5 $(@D)$(modname))"
+else
+debug_flags =
+endif
 orig_c_flags   = $(KBUILD_CFLAGS) $(ccflags-y) $(CFLAGS_$(basetarget).o)
 _c_flags       = $(filter-out $(CFLAGS_REMOVE_$(basetarget).o), $(orig_c_flags))
 _a_flags       = $(KBUILD_AFLAGS) $(asflags-y) $(AFLAGS_$(basetarget).o)
@@ -121,7 +129,8 @@ endif
 c_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) \
                 $(__c_flags) $(modkern_cflags) \
-                 -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags)
+                 -D"KBUILD_STR(s)=\#s" $(basename_flags) $(modname_flags) \
+                  $(debug_flags)
 a_flags        = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(KBUILD_CPPFLAGS) \
                 $(__a_flags) $(modkern_aflags)
diff --git a/scripts/basic/.gitignore b/scripts/basic/.gitignore
index 7304e19782c7..bf8b199ec598 100644
--- a/scripts/basic/.gitignore
+++ b/scripts/basic/.gitignore
@@ -1,3 +1,3 @@
+hash
 fixdep
-split-include
 docproc
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index 4c324a1f1e0e..09559951df12 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -9,7 +9,7 @@
 # fixdep:        Used to generate dependency information during build process
 # docproc:       Used in Documentation/DocBook
-hostprogs-y     := fixdep docproc
+hostprogs-y     := fixdep docproc hash
 always          := $(hostprogs-y)
 # fixdep is needed to compile other host programs
diff --git a/scripts/basic/hash.c b/scripts/basic/hash.c
new file mode 100644
index 000000000000..3299ad7fc8c0
--- /dev/null
+++ b/scripts/basic/hash.c
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2008 Red Hat, Inc., Jason Baron <jbaron@redhat.com>
+ *
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#define DYNAMIC_DEBUG_HASH_BITS 6
+static const char *program;
+static void usage(void)
+{
+        printf("Usage: %s <djb2|r5> <modname>\n", program);
+        exit(1);
+}
+/* djb2 hashing algorithm by Dan Bernstein. From:
+ * http://www.cse.yorku.ca/~oz/hash.html
+ */
+unsigned int djb2_hash(char *str)
+{
+        unsigned long hash = 5381;
+        int c;
+        c = *str;
+        while (c) {
+                hash = ((hash << 5) + hash) + c;
+                c = *++str;
+        }
+        return (unsigned int)(hash & ((1 << DYNAMIC_DEBUG_HASH_BITS) - 1));
+}
+unsigned int r5_hash(char *str)
+{
+        unsigned long hash = 0;
+        int c;
+        c = *str;
+        while (c) {
+                hash = (hash + (c << 4) + (c >> 4)) * 11;
+                c = *++str;
+        }
+        return (unsigned int)(hash & ((1 << DYNAMIC_DEBUG_HASH_BITS) - 1));
+}
+int main(int argc, char *argv[])
+{
+        program = argv[0];
+        if (argc != 3)
+                usage();
+        if (!strcmp(argv[1], "djb2"))
+                printf("%d\n", djb2_hash(argv[2]));
+        else if (!strcmp(argv[1], "r5"))
+                printf("%d\n", r5_hash(argv[2]));
+        else
+                usage();
+        exit(0);
+}
diff --git a/scripts/bootgraph.pl b/scripts/bootgraph.pl
new file mode 100644
index 000000000000..5e7316e5aa39
--- /dev/null
+++ b/scripts/bootgraph.pl
@@ -0,0 +1,149 @@
+#!/usr/bin/perl
+# Copyright 2008, Intel Corporation
+#
+# This file is part of the Linux kernel
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+# Authors:
+#       Arjan van de Ven <arjan@linux.intel.com>
+#
+# This script turns a dmesg output into a SVG graphic that shows which
+# functions take how much time. You can view SVG graphics with various
+# programs, including Inkscape, The Gimp and Firefox.
+#
+#
+# For this script to work, the kernel needs to be compiled with the
+# CONFIG_PRINTK_TIME configuration option enabled, and with
+# "initcall_debug" passed on the kernel command line.
+#
+# usage:
+#       dmesg | perl scripts/bootgraph.pl > output.svg
+#
+my %start, %end;
+my $done = 0;
+my $maxtime = 0;
+my $firsttime = 100;
+my $count = 0;
+my %pids;
+while (<>) {
+        my $line = $_;
+        if ($line =~ /([0-9\.]+)\] calling  ([a-zA-Z0-9\_]+)\+/) {
+                my $func = $2;
+                if ($done == 0) {
+                        $start{$func} = $1;
+                        if ($1 < $firsttime) {
+                                $firsttime = $1;
+                        }
+                }
+                if ($line =~ /\@ ([0-9]+)/) {
+                        $pids{$func} = $1;
+                }
+                $count = $count + 1;
+        }
+        if ($line =~ /([0-9\.]+)\] initcall ([a-zA-Z0-9\_]+)\+.*returned/) {
+                if ($done == 0) {
+                        $end{$2} = $1;
+                        $maxtime = $1;
+                }
+        }
+        if ($line =~ /Write protecting the/) {
+                $done = 1;
+        }
+        if ($line =~ /Freeing unused kernel memory/) {
+                $done = 1;
+        }
+}
+if ($count == 0) {
+        print "No data found in the dmesg. Make sure that 'printk.time=1' and\n";
+        print "'initcall_debug' are passed on the kernel command line.\n\n";
+        print "Usage: \n";
+        print "      dmesg | perl scripts/bootgraph.pl > output.svg\n\n";
+        exit;
+}
+print "<?xml version=\"1.0\" standalone=\"no\"?> \n";
+print "<svg width=\"1000\" height=\"100%\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
+my @styles;
+$styles[0] = "fill:rgb(0,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[1] = "fill:rgb(0,255,0);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[2] = "fill:rgb(255,0,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[3] = "fill:rgb(255,255,20);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[4] = "fill:rgb(255,0,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[5] = "fill:rgb(0,255,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[6] = "fill:rgb(0,128,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[7] = "fill:rgb(0,255,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[8] = "fill:rgb(255,0,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[9] = "fill:rgb(255,255,128);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[10] = "fill:rgb(255,128,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+$styles[11] = "fill:rgb(128,255,255);fill-opacity:0.5;stroke-width:1;stroke:rgb(0,0,0)";
+my $mult = 950.0 / ($maxtime - $firsttime);
+my $threshold = ($maxtime - $firsttime) / 60.0;
+my $stylecounter = 0;
+my %rows;
+my $rowscount = 1;
+while (($key,$value) = each %start) {
+        my $duration = $end{$key} - $start{$key};
+        if ($duration >= $threshold) {
+                my $s, $s2, $e, $y;
+                $pid = $pids{$key};
+                if (!defined($rows{$pid})) {
+                        $rows{$pid} = $rowscount;
+                        $rowscount = $rowscount + 1;
+                }
+                $s = ($value - $firsttime) * $mult;
+                $s2 = $s + 6;
+                $e = ($end{$key} - $firsttime) * $mult;
+                $w = $e - $s;
+                $y = $rows{$pid} * 150;
+                $y2 = $y + 4;
+                $style = $styles[$stylecounter];
+                $stylecounter = $stylecounter + 1;
+                if ($stylecounter > 11) {
+                        $stylecounter = 0;
+                };
+                print "<rect x=\"$s\" width=\"$w\" y=\"$y\" height=\"145\" style=\"$style\"/>\n";
+                print "<text transform=\"translate($s2,$y2) rotate(90)\">$key</text>\n";
+        }
+}
+# print the time line on top
+my $time = $firsttime;
+my $step = ($maxtime - $firsttime) / 15;
+while ($time < $maxtime) {
+        my $s2 = ($time - $firsttime) * $mult;
+        my $tm = int($time * 100) / 100.0;
+        print "<text transform=\"translate($s2,89) rotate(90)\">$tm</text>\n";
+        $time = $time + $step;
+}
+print "</svg>\n";
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bc6779398229..f88bb3e21cda 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# (c) 2001, Dave Jones. <davej@codemonkey.org.uk> (the file handling bit)
+# (c) 2001, Dave Jones. <davej@redhat.com> (the file handling bit)
 # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
 # (c) 2007, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite, etc)
 # Licensed under the terms of the GNU GPL License version 2
@@ -9,7 +9,7 @@ use strict;
 my $P = $0;
 $P =~ s@.*/@@g;
-my $V = '0.21';
+my $V = '0.24';
 use Getopt::Long qw(:config no_auto_abbrev);
@@ -66,6 +66,7 @@ if ($#ARGV < 0) {
 my $dbg_values = 0;
 my $dbg_possible = 0;
 my $dbg_type = 0;
+my $dbg_attr = 0;
 for my $key (keys %debug) {
        eval "\${dbg_$key} = '$debug{$key}';"
 }
@@ -112,7 +113,10 @@ our $Attribute	= qr{
                        const|
                        __read_mostly|
                        __kprobes|
-                        __(?:mem|cpu|dev|)(?:initdata|init)
+                        __(?:mem|cpu|dev|)(?:initdata|init)|
+                        ____cacheline_aligned|
+                        ____cacheline_aligned_in_smp|
+                        ____cacheline_internodealigned_in_smp
                  }x;
 our $Modifier;
 our $Inline     = qr{inline|__always_inline|noinline};
@@ -142,6 +146,11 @@ our $UTF8	= qr {
        |  \xF4[\x80-\x8F][\x80-\xBF]{2}     # plane 16
 }x;
+our $typeTypedefs = qr{(?x:
+        (?:__)?(?:u|s|be|le)(?:\d|\d\d)|
+        atomic_t
+)};
 our @typeList = (
        qr{void},
        qr{(?:unsigned\s+)?char},
@@ -155,7 +164,6 @@ our @typeList = (
        qr{float},
        qr{double},
        qr{bool},
-        qr{(?:__)?(?:u|s|be|le)(?:8|16|32|64)},
        qr{struct\s+$Ident},
        qr{union\s+$Ident},
        qr{enum\s+$Ident},
@@ -175,6 +183,7 @@ sub build_types {
                        (?:$Modifier\s+|const\s+)*
                        (?:
                                (?:typeof|__typeof__)\s*\(\s*\**\s*$Ident\s*\)|
+                                (?:$typeTypedefs\b)|
                                (?:${all}\b)
                        )
                        (?:\s+$Modifier|\s+const)*
@@ -331,7 +340,7 @@ sub sanitise_line {
                        $off++;
                        next;
                }
-                if (substr($line, $off, 2) eq '*/') {
+                if ($sanitise_quote eq '*/' && substr($line, $off, 2) eq '*/') {
                        $sanitise_quote = '';
                        substr($res, $off, 2, "$;$;");
                        $off++;
@@ -404,6 +413,7 @@ sub ctx_statement_block {
                # context.
                if ($off >= $len) {
                        for (; $remain > 0; $line++) {
+                                last if (!defined $lines[$line]);
                                next if ($lines[$line] =~ /^-/);
                                $remain--;
                                $loff = $len;
@@ -669,6 +679,22 @@ sub ctx_has_comment {
        return ($cmt ne '');
 }
+sub raw_line {
+        my ($linenr, $cnt) = @_;
+        my $offset = $linenr - 1;
+        $cnt++;
+        my $line;
+        while ($cnt) {
+                $line = $rawlines[$offset++];
+                next if (defined($line) && $line =~ /^-/);
+                $cnt--;
+        }
+        return $line;
+}
 sub cat_vet {
        my ($vet) = @_;
        my ($res, $coded);
@@ -782,9 +808,9 @@ sub annotate_values {
                        }
                        $type = 'N';
-                } elsif ($cur =~ /^(if|while|typeof|__typeof__|for)\b/o) {
+                } elsif ($cur =~ /^(if|while|for)\b/o) {
                        print "COND($1)\n" if ($dbg_values > 1);
-                        $av_pending = 'N';
+                        $av_pending = 'E';
                        $type = 'N';
                } elsif ($cur =~/^(case)/o) {
@@ -792,7 +818,7 @@ sub annotate_values {
                        $av_pend_colon = 'C';
                        $type = 'N';
-                } elsif ($cur =~/^(return|else|goto)/o) {
+                } elsif ($cur =~/^(return|else|goto|typeof|__typeof__)\b/o) {
                        print "KEYWORD($1)\n" if ($dbg_values > 1);
                        $type = 'N';
@@ -858,7 +884,7 @@ sub annotate_values {
                        print "CLOSE($1)\n" if ($dbg_values > 1);
                        $type = 'N';
-                } elsif ($cur =~ /^(-(?![->])|\+(?!\+)|\*|\&(?!\&))/o) {
+                } elsif ($cur =~ /^(-(?![->])|\+(?!\+)|\*|\&\&|\&)/o) {
                        my $variant;
                        print "OPV($1)\n" if ($dbg_values > 1);
@@ -892,12 +918,22 @@ sub annotate_values {
 sub possible {
        my ($possible, $line) = @_;
-        print "CHECK<$possible> ($line)\n" if ($dbg_possible > 1);
+        print "CHECK<$possible> ($line)\n" if ($dbg_possible > 2);
-        if ($possible !~ /^(?:$Modifier|$Storage|$Type|DEFINE_\S+)$/ &&
+        if ($possible !~ /(?:
-            $possible ne 'goto' && $possible ne 'return' &&
+                ^(?:
-            $possible ne 'case' && $possible ne 'else' &&
+                        $Modifier|
-            $possible ne 'asm' && $possible ne '__asm__' &&
+                        $Storage|
-            $possible !~ /^(typedef|struct|enum)\b/) {
+                        $Type|
+                        DEFINE_\S+|
+                        goto|
+                        return|
+                        case|
+                        else|
+                        asm|__asm__|
+                        do
+                )$|
+                ^(?:typedef|struct|enum)\b
+            )/x) {
                # Check for modifiers.
                $possible =~ s/\s*$Storage\s*//g;
                $possible =~ s/\s*$Sparse\s*//g;
@@ -915,6 +951,8 @@ sub possible {
                        push(@typeList, $possible);
                }
                build_types();
+        } else {
+                warn "NOTPOSS: $possible ($line)\n" if ($dbg_possible > 1);
        }
 }
@@ -954,6 +992,33 @@ sub CHK {
        }
 }
+sub check_absolute_file {
+        my ($absolute, $herecurr) = @_;
+        my $file = $absolute;
+        ##print "absolute<$absolute>\n";
+        # See if any suffix of this path is a path within the tree.
+        while ($file =~ s@^[^/]*/@@) {
+                if (-f "$root/$file") {
+                        ##print "file<$file>\n";
+                        last;
+                }
+        }
+        if (! -f _)  {
+                return 0;
+        }
+        # It is, so see if the prefix is acceptable.
+        my $prefix = $absolute;
+        substr($prefix, -length($file)) = '';
+        ##print "prefix<$prefix>\n";
+        if ($prefix ne ".../") {
+                WARN("use relative pathname instead of absolute in changelog text\n" . $herecurr);
+        }
+}
 sub process {
        my $filename = shift;
@@ -991,6 +1056,7 @@ sub process {
        # suppression flags
        my %suppress_ifbraces;
+        my %suppress_whiletrailers;
        # Pre-scan the patch sanitizing the lines.
        # Pre-scan the patch looking for any __setup documentation.
@@ -1025,9 +1091,14 @@ sub process {
                        # edge is a close comment then we must be in a comment
                        # at context start.
                        my $edge;
-                        for (my $ln = $linenr + 1; $ln < ($linenr + $realcnt); $ln++) {
+                        my $cnt = $realcnt;
-                                next if ($line =~ /^-/);
+                        for (my $ln = $linenr + 1; $cnt > 0; $ln++) {
-                                ($edge) = ($rawlines[$ln - 1] =~ m@(/\*|\*/)@);
+                                next if (defined $rawlines[$ln - 1] &&
+                                         $rawlines[$ln - 1] =~ /^-/);
+                                $cnt--;
+                                #print "RAW<$rawlines[$ln - 1]>\n";
+                                ($edge) = (defined $rawlines[$ln - 1] &&
+                                        $rawlines[$ln - 1] =~ m@(/\*|\*/)@);
                                last if (defined $edge);
                        }
                        if (defined $edge && $edge eq '*/') {
@@ -1075,6 +1146,7 @@ sub process {
                $linenr++;
                my $rawline = $rawlines[$linenr - 1];
+                my $hunk_line = ($realcnt != 0);
 #extract the line range in the file after the patch is applied
                if ($line=~/^\@\@ -\d+(?:,\d+)? \+(\d+)(,(\d+))? \@\@/) {
@@ -1090,6 +1162,7 @@ sub process {
                        $prev_values = 'E';
                        %suppress_ifbraces = ();
+                        %suppress_whiletrailers = ();
                        next;
 # track the line number as we move through the hunk, note that
@@ -1125,7 +1198,7 @@ sub process {
                        $realfile = $1;
                        $realfile =~ s@^[^/]*/@@;
-                        if ($realfile =~ m@include/asm/@) {
+                        if ($realfile =~ m@^include/asm/@) {
                                ERROR("do not modify files in include/asm, change architecture specific files in include/asm-<architecture>\n" . "$here$rawline\n");
                        }
                        next;
@@ -1159,6 +1232,20 @@ sub process {
                                $herecurr) if (!$emitted_corrupt++);
                }
+# Check for absolute kernel paths.
+                if ($tree) {
+                        while ($line =~ m{(?:^|\s)(/\S*)}g) {
+                                my $file = $1;
+                                if ($file =~ m{^(.*?)(?::\d+)+:?$} &&
+                                    check_absolute_file($1, $herecurr)) {
+                                        #
+                                } else {
+                                        check_absolute_file($file, $herecurr);
+                                }
+                        }
+                }
 # UTF-8 regex found at http://www.w3.org/International/questions/qa-forms-utf-8.en.php
                if (($realfile =~ /^$/ || $line =~ /^\+/) &&
                    $rawline !~ m/^$UTF8*$/) {
@@ -1171,11 +1258,8 @@ sub process {
                        ERROR("Invalid UTF-8, patch and commit message should be encoded in UTF-8\n" . $hereptr);
                }
-#ignore lines being removed
+# ignore non-hunk lines and lines being removed
-                if ($line=~/^-/) {next;}
+                next if (!$hunk_line || $line =~ /^-/);
-# check we are in a valid source file if not then ignore this hunk
-                next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
 #trailing whitespace
                if ($line =~ /^\+.*\015/) {
@@ -1186,6 +1270,10 @@ sub process {
                        my $herevet = "$here\n" . cat_vet($rawline) . "\n";
                        ERROR("trailing whitespace\n" . $herevet);
                }
+# check we are in a valid source file if not then ignore this hunk
+                next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
 #80 column limit
                if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                    $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
@@ -1200,8 +1288,8 @@ sub process {
                        WARN("adding a line without newline at end of file\n" . $herecurr);
                }
-# check we are in a valid source file *.[hc] if not then ignore this hunk
+# check we are in a valid source file C or perl if not then ignore this hunk
-                next if ($realfile !~ /\.[hc]$/);
+                next if ($realfile !~ /\.(h|c|pl)$/);
 # at the beginning of a line any tabs must come first and anything
 # more than 8 must use tabs.
@@ -1211,15 +1299,18 @@ sub process {
                        ERROR("code indent should use tabs where possible\n" . $herevet);
                }
+# check we are in a valid C source file if not then ignore this hunk
+                next if ($realfile !~ /\.(h|c)$/);
 # check for RCS/CVS revision markers
                if ($rawline =~ /^\+.*\$(Revision|Log|Id)(?:\$|)/) {
                        WARN("CVS style keyword markers, these will _not_ be updated\n". $herecurr);
                }
 # Check for potential 'bare' types
-                my ($stat, $cond, $line_nr_next, $remain_next);
+                my ($stat, $cond, $line_nr_next, $remain_next, $off_next);
                if ($realcnt && $line =~ /.\s*\S/) {
-                        ($stat, $cond, $line_nr_next, $remain_next) =
+                        ($stat, $cond, $line_nr_next, $remain_next, $off_next) =
                                ctx_statement_block($linenr, $realcnt, 0);
                        $stat =~ s/\n./\n /g;
                        $cond =~ s/\n./\n /g;
@@ -1240,7 +1331,7 @@ sub process {
                                possible($type, "A:" . $s);
                        # definitions in global scope can only start with types
-                        } elsif ($s =~ /^.(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?($Ident)\b/s) {
+                        } elsif ($s =~ /^.(?:$Storage\s+)?(?:$Inline\s+)?(?:const\s+)?($Ident)\b\s*(?!:)/s) {
                                possible($1, "B:" . $s);
                        }
@@ -1294,10 +1385,6 @@ sub process {
                                ERROR("switch and case should be at the same indent\n$hereline$err");
                        }
                }
-                if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
-                    $line !~ /\G(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$/g) {
-                        ERROR("trailing statements should be on next line\n" . $herecurr);
-                }
 # if/while/etc brace do not go on next line, unless defining a do while loop,
 # or if that brace on the next line is for something else
@@ -1338,6 +1425,91 @@ sub process {
                        }
                }
+# Check relative indent for conditionals and blocks.
+                if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
+                        my ($s, $c) = ($stat, $cond);
+                        substr($s, 0, length($c), '');
+                        # Make sure we remove the line prefixes as we have
+                        # none on the first line, and are going to readd them
+                        # where necessary.
+                        $s =~ s/\n./\n/gs;
+                        # Find out how long the conditional actually is.
+                        my @newlines = ($c =~ /\n/gs);
+                        my $cond_lines = 1 + $#newlines;
+                        # We want to check the first line inside the block
+                        # starting at the end of the conditional, so remove:
+                        #  1) any blank line termination
+                        #  2) any opening brace { on end of the line
+                        #  3) any do (...) {
+                        my $continuation = 0;
+                        my $check = 0;
+                        $s =~ s/^.*\bdo\b//;
+                        $s =~ s/^\s*{//;
+                        if ($s =~ s/^\s*\\//) {
+                                $continuation = 1;
+                        }
+                        if ($s =~ s/^\s*?\n//) {
+                                $check = 1;
+                                $cond_lines++;
+                        }
+                        # Also ignore a loop construct at the end of a
+                        # preprocessor statement.
+                        if (($prevline =~ /^.\s*#\s*define\s/ ||
+                            $prevline =~ /\\\s*$/) && $continuation == 0) {
+                                $check = 0;
+                        }
+                        my $cond_ptr = -1;
+                        $continuation = 0;
+                        while ($cond_ptr != $cond_lines) {
+                                $cond_ptr = $cond_lines;
+                                # If we see an #else/#elif then the code
+                                # is not linear.
+                                if ($s =~ /^\s*\#\s*(?:else|elif)/) {
+                                        $check = 0;
+                                }
+                                # Ignore:
+                                #  1) blank lines, they should be at 0,
+                                #  2) preprocessor lines, and
+                                #  3) labels.
+                                if ($continuation ||
+                                    $s =~ /^\s*?\n/ ||
+                                    $s =~ /^\s*#\s*?/ ||
+                                    $s =~ /^\s*$Ident\s*:/) {
+                                        $continuation = ($s =~ /^.*?\\\n/) ? 1 : 0;
+                                        $s =~ s/^.*?\n//;
+                                        $cond_lines++;
+                                }
+                        }
+                        my (undef, $sindent) = line_stats("+" . $s);
+                        my $stat_real = raw_line($linenr, $cond_lines);
+                        # Check if either of these lines are modified, else
+                        # this is not this patch's fault.
+                        if (!defined($stat_real) ||
+                            $stat !~ /^\+/ && $stat_real !~ /^\+/) {
+                                $check = 0;
+                        }
+                        if (defined($stat_real) && $cond_lines > 1) {
+                                $stat_real = "[...]\n$stat_real";
+                        }
+                        #print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s> cond_lines<$cond_lines> stat_real<$stat_real> stat<$stat>\n";
+                        if ($check && (($sindent % 8) != 0 ||
+                            ($sindent <= $indent && $s ne ''))) {
+                                WARN("suspect code indent for conditional statements ($indent, $sindent)\n" . $herecurr . "$stat_real\n");
+                        }
+                }
                # Track the 'values' across context and added lines.
                my $opline = $line; $opline =~ s/^./ /;
                my ($curr_values, $curr_vars) =
@@ -1363,6 +1535,15 @@ sub process {
                        }
                        next;
                }
+# TEST: allow direct testing of the attribute matcher.
+                if ($dbg_attr) {
+                        if ($line =~ /^.\s*$Attribute\s*$/) {
+                                ERROR("TEST: is attr\n" . $herecurr);
+                        } elsif ($dbg_attr > 1 && $line =~ /^.+($Attribute)/) {
+                                ERROR("TEST: is not attr ($1 is)\n". $herecurr);
+                        }
+                        next;
+                }
 # check for initialisation to aggregates open brace on the next line
                if ($prevline =~ /$Declare\s*$Ident\s*=\s*$/ &&
@@ -1395,13 +1576,14 @@ sub process {
                if (($line =~ /EXPORT_SYMBOL.*\((.*)\)/) ||
                    ($line =~ /EXPORT_UNUSED_SYMBOL.*\((.*)\)/)) {
                        my $name = $1;
-                        if (($prevline !~ /^}/) &&
+                        if ($prevline !~ /(?:
-                           ($prevline !~ /^\+}/) &&
+                                ^.}|
-                           ($prevline !~ /^ }/) &&
+                                ^.DEFINE_$Ident\(\Q$name\E\)|
-                           ($prevline !~ /^.DECLARE_$Ident\(\Q$name\E\)/) &&
+                                ^.DECLARE_$Ident\(\Q$name\E\)|
-                           ($prevline !~ /^.LIST_HEAD\(\Q$name\E\)/) &&
+                                ^.LIST_HEAD\(\Q$name\E\)|
-                           ($prevline !~ /^.$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(/) &&
+                                ^.$Type\s*\(\s*\*\s*\Q$name\E\s*\)\s*\(|
-                           ($prevline !~ /\b\Q$name\E(?:\s+$Attribute)?\s*(?:;|=|\[)/)) {
+                                \b\Q$name\E(?:\s+$Attribute)?\s*(?:;|=|\[)
+                            )/x) {
                                WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
                        }
                }
@@ -1422,6 +1604,7 @@ sub process {
                if ($line =~ /\btypedef\s/ &&
                    $line !~ /\btypedef\s+$Type\s+\(\s*\*?$Ident\s*\)\s*\(/ &&
                    $line !~ /\btypedef\s+$Type\s+$Ident\s*\(/ &&
+                    $line !~ /\b$typeTypedefs\b/ &&
                    $line !~ /\b__bitwise(?:__|)\b/) {
                        WARN("do not add new typedefs\n" . $herecurr);
                }
@@ -1493,11 +1676,13 @@ sub process {
 # check for spacing round square brackets; allowed:
 #  1. with a type on the left -- int [] a;
-#  2. at the beginning of a line for slice initialisers -- [0..10] = 5,
+#  2. at the beginning of a line for slice initialisers -- [0...10] = 5,
+#  3. inside a curly brace -- = { [0...10] = 5 }
                while ($line =~ /(.*?\s)\[/g) {
                        my ($where, $prefix) = ($-[1], $1);
                        if ($prefix !~ /$Type\s+$/ &&
-                            ($where != 0 || $prefix !~ /^.\s+$/)) {
+                            ($where != 0 || $prefix !~ /^.\s+$/) &&
+                            $prefix !~ /{\s+$/) {
                                ERROR("space prohibited before open square bracket '['\n" . $herecurr);
                        }
                }
@@ -1632,7 +1817,7 @@ sub process {
                                # unary operator, or a cast
                                } elsif ($op eq '!' || $op eq '~' ||
                                         $opv eq '*U' || $opv eq '-U' ||
-                                         $opv eq '&U') {
+                                         $opv eq '&U' || $opv eq '&&U') {
                                        if ($ctx !~ /[WEBC]x./ && $ca !~ /(?:\)|!|~|\*|-|\&|\||\+\+|\-\-|\{)$/) {
                                                ERROR("space required before that '$op' $at\n" . $hereptr);
                                        }
@@ -1785,7 +1970,26 @@ sub process {
 # Check for illegal assignment in if conditional -- and check for trailing
 # statements after the conditional.
-                if ($line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
+                if ($line =~ /do\s*(?!{)/) {
+                        my ($stat_next) = ctx_statement_block($line_nr_next,
+                                                $remain_next, $off_next);
+                        $stat_next =~ s/\n./\n /g;
+                        ##print "stat<$stat> stat_next<$stat_next>\n";
+                        if ($stat_next =~ /^\s*while\b/) {
+                                # If the statement carries leading newlines,
+                                # then count those as offsets.
+                                my ($whitespace) =
+                                        ($stat_next =~ /^((?:\s*\n[+-])*\s*)/s);
+                                my $offset =
+                                        statement_rawlines($whitespace) - 1;
+                                $suppress_whiletrailers{$line_nr_next +
+                                                                $offset} = 1;
+                        }
+                }
+                if (!defined $suppress_whiletrailers{$linenr} &&
+                    $line =~ /\b(?:if|while|for)\s*\(/ && $line !~ /^.\s*#/) {
                        my ($s, $c) = ($stat, $cond);
                        if ($c =~ /\bif\s*\(.*[^<>!=]=[^=].*/) {
@@ -1800,57 +2004,16 @@ sub process {
                        if (length($c) && $s !~ /^\s*{?\s*\\*\s*$/ &&
                            $c !~ /}\s*while\s*/)
                        {
-                                ERROR("trailing statements should be on next line\n" . $herecurr);
+                                # Find out how long the conditional actually is.
-                        }
+                                my @newlines = ($c =~ /\n/gs);
-                }
+                                my $cond_lines = 1 + $#newlines;
-# Check relative indent for conditionals and blocks.
-                if ($line =~ /\b(?:(?:if|while|for)\s*\(|do\b)/ && $line !~ /^.\s*#/ && $line !~ /\}\s*while\s*/) {
-                        my ($s, $c) = ($stat, $cond);
-                        substr($s, 0, length($c), '');
-                        # Make sure we remove the line prefixes as we have
+                                my $stat_real = raw_line($linenr, $cond_lines);
-                        # none on the first line, and are going to readd them
+                                if (defined($stat_real) && $cond_lines > 1) {
-                        # where necessary.
+                                        $stat_real = "[...]\n$stat_real";
-                        $s =~ s/\n./\n/gs;
+                                }
-                        # We want to check the first line inside the block
-                        # starting at the end of the conditional, so remove:
-                        #  1) any blank line termination
-                        #  2) any opening brace { on end of the line
-                        #  3) any do (...) {
-                        my $continuation = 0;
-                        my $check = 0;
-                        $s =~ s/^.*\bdo\b//;
-                        $s =~ s/^\s*{//;
-                        if ($s =~ s/^\s*\\//) {
-                                $continuation = 1;
-                        }
-                        if ($s =~ s/^\s*\n//) {
-                                $check = 1;
-                        }
-                        # Also ignore a loop construct at the end of a
-                        # preprocessor statement.
-                        if (($prevline =~ /^.\s*#\s*define\s/ ||
-                            $prevline =~ /\\\s*$/) && $continuation == 0) {
-                                $check = 0;
-                        }
-                        # Ignore the current line if its is a preprocessor
-                        # line.
-                        if ($s =~ /^\s*#\s*/) {
-                                $check = 0;
-                        }
-                        my (undef, $sindent) = line_stats("+" . $s);
-                        ##print "line<$line> prevline<$prevline> indent<$indent> sindent<$sindent> check<$check> continuation<$continuation> s<$s>\n";
-                        if ($check && (($sindent % 8) != 0 ||
+                                ERROR("trailing statements should be on next line\n" . $herecurr . $stat_real);
-                            ($sindent <= $indent && $s ne ''))) {
-                                WARN("suspect code indent for conditional statements\n" . $herecurr);
                        }
                }
@@ -1877,6 +2040,15 @@ sub process {
                                ERROR("trailing statements should be on next line\n" . $herecurr);
                        }
                }
+# case and default should not have general statements after them
+                if ($line =~ /^.\s*(?:case\s*.*|default\s*):/g &&
+                    $line !~ /\G(?:
+                        (?:\s*$;*)(?:\s*{)?(?:\s*$;*)(?:\s*\\)?\s*$|
+                        \s*return\s+
+                    )/xg)
+                {
+                        ERROR("trailing statements should be on next line\n" . $herecurr);
+                }
                # Check for }<nl>else {, these must be at the same
                # indent level to be relevant to each other.
@@ -1913,12 +2085,17 @@ sub process {
 #warn if <asm/foo.h> is #included and <linux/foo.h> is available (uses RAW line)
                if ($tree && $rawline =~ m{^.\s*\#\s*include\s*\<asm\/(.*)\.h\>}) {
-                        my $checkfile = "include/linux/$1.h";
+                        my $file = "$1.h";
-                        if (-f "$root/$checkfile" && $realfile ne $checkfile &&
+                        my $checkfile = "include/linux/$file";
+                        if (-f "$root/$checkfile" &&
+                            $realfile ne $checkfile &&
                            $1 ne 'irq')
                        {
-                                WARN("Use #include <linux/$1.h> instead of <asm/$1.h>\n" .
+                                if ($realfile =~ m{^arch/}) {
-                                        $herecurr);
+                                        CHK("Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+                                } else {
+                                        WARN("Use #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
+                                }
                        }
                }
@@ -1953,8 +2130,8 @@ sub process {
                        # Extract the remainder of the define (if any) and
                        # rip off surrounding spaces, and trailing \'s.
                        $rest = '';
-                        while ($off != 0 || ($cnt > 0 && $rest =~ /(?:^|\\)\s*$/)) {
+                        while ($off != 0 || ($cnt > 0 && $rest =~ /\\\s*$/)) {
-                                #print "ADDING $off <" . substr($lines[$ln - 1], $off) . ">\n";
+                                #print "ADDING cnt<$cnt> $off <" . substr($lines[$ln - 1], $off) . "> rest<$rest>\n";
                                if ($off != 0 || $lines[$ln - 1] !~ /^-/) {
                                        $rest .= substr($lines[$ln - 1], $off) . "\n";
                                        $cnt--;
@@ -1978,9 +2155,10 @@ sub process {
                        $dstat =~ s/\s*$//s;
                        # Flatten any parentheses and braces
-                        while ($dstat =~ s/\([^\(\)]*\)/1/) {
+                        while ($dstat =~ s/\([^\(\)]*\)/1/ ||
-                        }
+                               $dstat =~ s/\{[^\{\}]*\}/1/ ||
-                        while ($dstat =~ s/\{[^\{\}]*\}/1/) {
+                               $dstat =~ s/\[[^\{\}]*\]/1/)
+                        {
                        }
                        my $exceptions = qr{
@@ -2003,6 +2181,7 @@ sub process {
                                if ($dstat ne '' &&
                                    $dstat !~ /^(?:$Ident|-?$Constant)$/ &&
                                    $dstat !~ /$exceptions/ &&
+                                    $dstat !~ /^\.$Ident\s*=/ &&
                                    $dstat =~ /$Operators/)
                                {
                                        ERROR("Macros with complex values should be enclosed in parenthesis\n" . "$here\n$ctx\n");
@@ -2103,10 +2282,10 @@ sub process {
                        }
                        if ($level == 0 && $block =~ /^\s*\{/ && !$allowed) {
                                my $herectx = $here . "\n";;
-                                my $end = $linenr + statement_rawlines($block) - 1;
+                                my $cnt = statement_rawlines($block);
-                                for (my $ln = $linenr - 1; $ln < $end; $ln++) {
+                                for (my $n = 0; $n < $cnt; $n++) {
-                                        $herectx .= $rawlines[$ln] . "\n";;
+                                        $herectx .= raw_line($linenr, $n) . "\n";;
                                }
                                WARN("braces {} are not necessary for single statement blocks\n" . $herectx);
@@ -2281,6 +2460,7 @@ sub process {
                my $string;
                while ($line =~ /(?:^|")([X\t]*)(?:"|$)/g) {
                        $string = substr($rawline, $-[1], $+[1] - $-[1]);
+                        $string =~ s/%%/__/g;
                        if ($string =~ /(?<!%)%L[udi]/) {
                                WARN("\%Ld/%Lu are not-standard C, use %lld/%llu\n" . $herecurr);
                                last;
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 3eca62566d6b..f7e8e93ff30d 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -81,7 +81,10 @@ my (@stack, $re, $dre, $x, $xs);
                $re = qr/.*st[dw]u.*r1,-($x{1,8})\(r1\)/o;
        } elsif ($arch =~ /^s390x?$/) {
                #   11160:       a7 fb ff 60             aghi   %r15,-160
-                $re = qr/.*ag?hi.*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})/o;
+                # or
+                #  100092:       e3 f0 ff c8 ff 71       lay     %r15,-56(%r15)
+                $re = qr/.*(?:lay|ag?hi).*\%r15,-(([0-9]{2}|[3-9])[0-9]{2})
+                      (?:\(\%r15\))?$/ox;
        } elsif ($arch =~ /^sh64$/) {
                #XXX: we only check for the immediate case presently,
                #     though we will want to check for the movi/sub
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 4c9890ec2528..d4dc222a74f3 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -206,6 +206,20 @@ static void do_usb_table(void *symval, unsigned long size,
                do_usb_entry_multi(symval + i, mod);
 }
+/* Looks like: hid:bNvNpN */
+static int do_hid_entry(const char *filename,
+                             struct hid_device_id *id, char *alias)
+{
+        id->vendor = TO_NATIVE(id->vendor);
+        id->product = TO_NATIVE(id->product);
+        sprintf(alias, "hid:b%04X", id->bus);
+        ADD(alias, "v", id->vendor != HID_ANY_ID, id->vendor);
+        ADD(alias, "p", id->product != HID_ANY_ID, id->product);
+        return 1;
+}
 /* Looks like: ieee1394:venNmoNspNverN */
 static int do_ieee1394_entry(const char *filename,
                             struct ieee1394_device_id *id, char *alias)
@@ -629,6 +643,59 @@ static int do_i2c_entry(const char *filename, struct i2c_device_id *id,
        return 1;
 }
+static const struct dmifield {
+        const char *prefix;
+        int field;
+} dmi_fields[] = {
+        { "bvn", DMI_BIOS_VENDOR },
+        { "bvr", DMI_BIOS_VERSION },
+        { "bd",  DMI_BIOS_DATE },
+        { "svn", DMI_SYS_VENDOR },
+        { "pn",  DMI_PRODUCT_NAME },
+        { "pvr", DMI_PRODUCT_VERSION },
+        { "rvn", DMI_BOARD_VENDOR },
+        { "rn",  DMI_BOARD_NAME },
+        { "rvr", DMI_BOARD_VERSION },
+        { "cvn", DMI_CHASSIS_VENDOR },
+        { "ct",  DMI_CHASSIS_TYPE },
+        { "cvr", DMI_CHASSIS_VERSION },
+        { NULL,  DMI_NONE }
+};
+static void dmi_ascii_filter(char *d, const char *s)
+{
+        /* Filter out characters we don't want to see in the modalias string */
+        for (; *s; s++)
+                if (*s > ' ' && *s < 127 && *s != ':')
+                        *(d++) = *s;
+        *d = 0;
+}
+static int do_dmi_entry(const char *filename, struct dmi_system_id *id,
+                        char *alias)
+{
+        int i, j;
+        sprintf(alias, "dmi*");
+        for (i = 0; i < ARRAY_SIZE(dmi_fields); i++) {
+                for (j = 0; j < 4; j++) {
+                        if (id->matches[j].slot &&
+                            id->matches[j].slot == dmi_fields[i].field) {
+                                sprintf(alias + strlen(alias), ":%s*",
+                                        dmi_fields[i].prefix);
+                                dmi_ascii_filter(alias + strlen(alias),
+                                                 id->matches[j].substr);
+                                strcat(alias, "*");
+                        }
+                }
+        }
+        strcat(alias, ":");
+        return 1;
+}
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -692,6 +759,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
        else if (sym_is(symname, "__mod_usb_device_table"))
                /* special case to handle bcdDevice ranges */
                do_usb_table(symval, sym->st_size, mod);
+        else if (sym_is(symname, "__mod_hid_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct hid_device_id), "hid",
+                         do_hid_entry, mod);
        else if (sym_is(symname, "__mod_ieee1394_device_table"))
                do_table(symval, sym->st_size,
                         sizeof(struct ieee1394_device_id), "ieee1394",
@@ -760,6 +831,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                do_table(symval, sym->st_size,
                         sizeof(struct i2c_device_id), "i2c",
                         do_i2c_entry, mod);
+        else if (sym_is(symname, "__mod_dmi_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct dmi_system_id), "dmi",
+                         do_dmi_entry, mod);
        free(zeros);
 }
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 8e0de6a5e18a..88921611b22e 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1726,6 +1726,14 @@ static void add_header(struct buffer *b, struct module *mod)
        buf_printf(b, "};\n");
 }
+void add_staging_flag(struct buffer *b, const char *name)
+{
+        static const char *staging_dir = "drivers/staging";
+        if (strncmp(staging_dir, name, strlen(staging_dir)) == 0)
+                buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
+}
 /**
 * Record CRCs for unresolved symbols
 **/
@@ -2135,6 +2143,7 @@ int main(int argc, char **argv)
                buf.pos = 0;
                add_header(&buf, mod);
+                add_staging_flag(&buf, mod->name);
                err |= add_versions(&buf, mod);
                add_depends(&buf, mod, modules);
                add_moddevtable(&buf, mod);
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
new file mode 100755
index 000000000000..f56d760bd589
--- /dev/null
+++ b/scripts/recordmcount.pl
@@ -0,0 +1,395 @@
+#!/usr/bin/perl -w
+# (c) 2008, Steven Rostedt <srostedt@redhat.com>
+# Licensed under the terms of the GNU GPL License version 2
+#
+# recordmcount.pl - makes a section called __mcount_loc that holds
+#                   all the offsets to the calls to mcount.
+#
+#
+# What we want to end up with is a section in vmlinux called
+# __mcount_loc that contains a list of pointers to all the
+# call sites in the kernel that call mcount. Later on boot up, the kernel
+# will read this list, save the locations and turn them into nops.
+# When tracing or profiling is later enabled, these locations will then
+# be converted back to pointers to some function.
+#
+# This is no easy feat. This script is called just after the original
+# object is compiled and before it is linked.
+#
+# The references to the call sites are offsets from the section of text
+# that the call site is in. Hence, all functions in a section that
+# has a call site to mcount, will have the offset from the beginning of
+# the section and not the beginning of the function.
+#
+# The trick is to find a way to record the beginning of the section.
+# The way we do this is to look at the first function in the section
+# which will also be the location of that section after final link.
+# e.g.
+#
+#  .section ".text.sched"
+#  .globl my_func
+#  my_func:
+#        [...]
+#        call mcount  (offset: 0x5)
+#        [...]
+#        ret
+#  other_func:
+#        [...]
+#        call mcount (offset: 0x1b)
+#        [...]
+#
+# Both relocation offsets for the mcounts in the above example will be
+# offset from .text.sched. If we make another file called tmp.s with:
+#
+#  .section __mcount_loc
+#  .quad  my_func + 0x5
+#  .quad  my_func + 0x1b
+#
+# We can then compile this tmp.s into tmp.o, and link it to the original
+# object.
+#
+# But this gets hard if my_func is not globl (a static function).
+# In such a case we have:
+#
+#  .section ".text.sched"
+#  my_func:
+#        [...]
+#        call mcount  (offset: 0x5)
+#        [...]
+#        ret
+#  .globl my_func
+#  other_func:
+#        [...]
+#        call mcount (offset: 0x1b)
+#        [...]
+#
+# If we make the tmp.s the same as above, when we link together with
+# the original object, we will end up with two symbols for my_func:
+# one local, one global.  After final compile, we will end up with
+# an undefined reference to my_func.
+#
+# Since local objects can reference local variables, we need to find
+# a way to make tmp.o reference the local objects of the original object
+# file after it is linked together. To do this, we convert the my_func
+# into a global symbol before linking tmp.o. Then after we link tmp.o
+# we will only have a single symbol for my_func that is global.
+# We can convert my_func back into a local symbol and we are done.
+#
+# Here are the steps we take:
+#
+# 1) Record all the local symbols by using 'nm'
+# 2) Use objdump to find all the call site offsets and sections for
+#    mcount.
+# 3) Compile the list into its own object.
+# 4) Do we have to deal with local functions? If not, go to step 8.
+# 5) Make an object that converts these local functions to global symbols
+#    with objcopy.
+# 6) Link together this new object with the list object.
+# 7) Convert the local functions back to local symbols and rename
+#    the result as the original object.
+#    End.
+# 8) Link the object with the list object.
+# 9) Move the result back to the original object.
+#    End.
+#
+use strict;
+my $P = $0;
+$P =~ s@.*/@@g;
+my $V = '0.1';
+if ($#ARGV < 6) {
+        print "usage: $P arch objdump objcopy cc ld nm rm mv inputfile\n";
+        print "version: $V\n";
+        exit(1);
+}
+my ($arch, $objdump, $objcopy, $cc, $ld, $nm, $rm, $mv, $inputfile) = @ARGV;
+$objdump = "objdump" if ((length $objdump) == 0);
+$objcopy = "objcopy" if ((length $objcopy) == 0);
+$cc = "gcc" if ((length $cc) == 0);
+$ld = "ld" if ((length $ld) == 0);
+$nm = "nm" if ((length $nm) == 0);
+$rm = "rm" if ((length $rm) == 0);
+$mv = "mv" if ((length $mv) == 0);
+#print STDERR "running: $P '$arch' '$objdump' '$objcopy' '$cc' '$ld' " .
+#    "'$nm' '$rm' '$mv' '$inputfile'\n";
+my %locals;             # List of local (static) functions
+my %weak;               # List of weak functions
+my %convert;            # List of local functions used that needs conversion
+my $type;
+my $section_regex;      # Find the start of a section
+my $function_regex;     # Find the name of a function
+                        #    (return offset and func name)
+my $mcount_regex;       # Find the call site to mcount (return offset)
+if ($arch eq "x86_64") {
+    $section_regex = "Disassembly of section";
+    $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount([+-]0x[0-9a-zA-Z]+)?\$";
+    $type = ".quad";
+    # force flags for this arch
+    $ld .= " -m elf_x86_64";
+    $objdump .= " -M x86-64";
+    $objcopy .= " -O elf64-x86-64";
+    $cc .= " -m64";
+} elsif ($arch eq "i386") {
+    $section_regex = "Disassembly of section";
+    $function_regex = "^([0-9a-fA-F]+)\\s+<(.*?)>:";
+    $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\smcount\$";
+    $type = ".long";
+    # force flags for this arch
+    $ld .= " -m elf_i386";
+    $objdump .= " -M i386";
+    $objcopy .= " -O elf32-i386";
+    $cc .= " -m32";
+} else {
+    die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
+}
+my $text_found = 0;
+my $read_function = 0;
+my $opened = 0;
+my $mcount_section = "__mcount_loc";
+my $dirname;
+my $filename;
+my $prefix;
+my $ext;
+if ($inputfile =~ m,^(.*)/([^/]*)$,) {
+    $dirname = $1;
+    $filename = $2;
+} else {
+    $dirname = ".";
+    $filename = $inputfile;
+}
+if ($filename =~ m,^(.*)(\.\S),) {
+    $prefix = $1;
+    $ext = $2;
+} else {
+    $prefix = $filename;
+    $ext = "";
+}
+my $mcount_s = $dirname . "/.tmp_mc_" . $prefix . ".s";
+my $mcount_o = $dirname . "/.tmp_mc_" . $prefix . ".o";
+#
+# --globalize-symbols came out in 2.17, we must test the version
+# of objcopy, and if it is less than 2.17, then we can not
+# record local functions.
+my $use_locals = 01;
+my $local_warn_once = 0;
+my $found_version = 0;
+open (IN, "$objcopy --version |") || die "error running $objcopy";
+while (<IN>) {
+    if (/objcopy.*\s(\d+)\.(\d+)/) {
+        my $major = $1;
+        my $minor = $2;
+        $found_version = 1;
+        if ($major < 2 ||
+            ($major == 2 && $minor < 17)) {
+            $use_locals = 0;
+        }
+        last;
+    }
+}
+close (IN);
+if (!$found_version) {
+    print STDERR "WARNING: could not find objcopy version.\n" .
+        "\tDisabling local function references.\n";
+}
+#
+# Step 1: find all the local (static functions) and weak symbols.
+#        't' is local, 'w/W' is weak (we never use a weak function)
+#
+open (IN, "$nm $inputfile|") || die "error running $nm";
+while (<IN>) {
+    if (/^[0-9a-fA-F]+\s+t\s+(\S+)/) {
+        $locals{$1} = 1;
+    } elsif (/^[0-9a-fA-F]+\s+([wW])\s+(\S+)/) {
+        $weak{$2} = $1;
+    }
+}
+close(IN);
+my @offsets;            # Array of offsets of mcount callers
+my $ref_func;           # reference function to use for offsets
+my $offset = 0;         # offset of ref_func to section beginning
+##
+# update_funcs - print out the current mcount callers
+#
+#  Go through the list of offsets to callers and write them to
+#  the output file in a format that can be read by an assembler.
+#
+sub update_funcs
+{
+    return if ($#offsets < 0);
+    defined($ref_func) || die "No function to reference";
+    # A section only had a weak function, to represent it.
+    # Unfortunately, a weak function may be overwritten by another
+    # function of the same name, making all these offsets incorrect.
+    # To be safe, we simply print a warning and bail.
+    if (defined $weak{$ref_func}) {
+        print STDERR
+            "$inputfile: WARNING: referencing weak function" .
+            " $ref_func for mcount\n";
+        return;
+    }
+    # is this function static? If so, note this fact.
+    if (defined $locals{$ref_func}) {
+        # only use locals if objcopy supports globalize-symbols
+        if (!$use_locals) {
+            return;
+        }
+        $convert{$ref_func} = 1;
+    }
+    # Loop through all the mcount caller offsets and print a reference
+    # to the caller based from the ref_func.
+    for (my $i=0; $i <= $#offsets; $i++) {
+        if (!$opened) {
+            open(FILE, ">$mcount_s") || die "can't create $mcount_s\n";
+            $opened = 1;
+            print FILE "\t.section $mcount_section,\"a\",\@progbits\n";
+        }
+        printf FILE "\t%s %s + %d\n", $type, $ref_func, $offsets[$i] - $offset;
+    }
+}
+#
+# Step 2: find the sections and mcount call sites
+#
+open(IN, "$objdump -dr $inputfile|") || die "error running $objdump";
+my $text;
+while (<IN>) {
+    # is it a section?
+    if (/$section_regex/) {
+        $read_function = 1;
+        # print out any recorded offsets
+        update_funcs() if ($text_found);
+        # reset all markers and arrays
+        $text_found = 0;
+        undef($ref_func);
+        undef(@offsets);
+    # section found, now is this a start of a function?
+    } elsif ($read_function && /$function_regex/) {
+        $text_found = 1;
+        $offset = hex $1;
+        $text = $2;
+        # if this is either a local function or a weak function
+        # keep looking for functions that are global that
+        # we can use safely.
+        if (!defined($locals{$text}) && !defined($weak{$text})) {
+            $ref_func = $text;
+            $read_function = 0;
+        } else {
+            # if we already have a function, and this is weak, skip it
+            if (!defined($ref_func) || !defined($weak{$text})) {
+                $ref_func = $text;
+            }
+        }
+    }
+    # is this a call site to mcount? If so, record it to print later
+    if ($text_found && /$mcount_regex/) {
+        $offsets[$#offsets + 1] = hex $1;
+    }
+}
+# dump out anymore offsets that may have been found
+update_funcs() if ($text_found);
+# If we did not find any mcount callers, we are done (do nothing).
+if (!$opened) {
+    exit(0);
+}
+close(FILE);
+#
+# Step 3: Compile the file that holds the list of call sites to mcount.
+#
+`$cc -o $mcount_o -c $mcount_s`;
+my @converts = keys %convert;
+#
+# Step 4: Do we have sections that started with local functions?
+#
+if ($#converts >= 0) {
+    my $globallist = "";
+    my $locallist = "";
+    foreach my $con (@converts) {
+        $globallist .= " --globalize-symbol $con";
+        $locallist .= " --localize-symbol $con";
+    }
+    my $globalobj = $dirname . "/.tmp_gl_" . $filename;
+    my $globalmix = $dirname . "/.tmp_mx_" . $filename;
+    #
+    # Step 5: set up each local function as a global
+    #
+    `$objcopy $globallist $inputfile $globalobj`;
+    #
+    # Step 6: Link the global version to our list.
+    #
+    `$ld -r $globalobj $mcount_o -o $globalmix`;
+    #
+    # Step 7: Convert the local functions back into local symbols
+    #
+    `$objcopy $locallist $globalmix $inputfile`;
+    # Remove the temp files
+    `$rm $globalobj $globalmix`;
+} else {
+    my $mix = $dirname . "/.tmp_mx_" . $filename;
+    #
+    # Step 8: Link the object with our list of call sites object.
+    #
+    `$ld -r $inputfile $mcount_o -o $mix`;
+    #
+    # Step 9: Move the result back to the original object.
+    #
+    `$mv $mix $inputfile`;
+}
+# Clean up the temp files
+`$rm $mcount_o $mcount_s`;
+exit(0);
diff --git a/scripts/selinux/Makefile b/scripts/selinux/Makefile
new file mode 100644
index 000000000000..ca4b1ec01822
--- /dev/null
+++ b/scripts/selinux/Makefile
@@ -0,0 +1,2 @@
+subdir-y := mdp
+subdir- += mdp
diff --git a/scripts/selinux/README b/scripts/selinux/README
new file mode 100644
index 000000000000..a936315ba2c8
--- /dev/null
+++ b/scripts/selinux/README
@@ -0,0 +1,2 @@
+Please see Documentation/SELinux.txt for information on
+installing a dummy SELinux policy.
diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh
new file mode 100644
index 000000000000..7b9ccf61f8f9
--- /dev/null
+++ b/scripts/selinux/install_policy.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+if [ `id -u` -ne 0 ]; then
+        echo "$0: must be root to install the selinux policy"
+        exit 1
+fi
+SF=`which setfiles`
+if [ $? -eq 1 ]; then
+        if [ -f /sbin/setfiles ]; then
+                SF="/usr/setfiles"
+        else
+                echo "no selinux tools installed: setfiles"
+                exit 1
+        fi
+fi
+cd mdp
+CP=`which checkpolicy`
+VERS=`$CP -V | awk '{print $1}'`
+./mdp policy.conf file_contexts
+$CP -o policy.$VERS policy.conf
+mkdir -p /etc/selinux/dummy/policy
+mkdir -p /etc/selinux/dummy/contexts/files
+cp file_contexts /etc/selinux/dummy/contexts/files
+cp dbus_contexts /etc/selinux/dummy/contexts
+cp policy.$VERS /etc/selinux/dummy/policy
+FC_FILE=/etc/selinux/dummy/contexts/files/file_contexts
+if [ ! -d /etc/selinux ]; then
+        mkdir -p /etc/selinux
+fi
+if [ ! -f /etc/selinux/config ]; then
+        cat > /etc/selinux/config << EOF
+SELINUX=enforcing
+SELINUXTYPE=dummy
+EOF
+else
+        TYPE=`cat /etc/selinux/config | grep "^SELINUXTYPE" | tail -1 | awk -F= '{ print $2 '}`
+        if [ "eq$TYPE" != "eqdummy" ]; then
+                selinuxenabled
+                if [ $? -eq 0 ]; then
+                        echo "SELinux already enabled with a non-dummy policy."
+                        echo "Exiting.  Please install policy by hand if that"
+                        echo "is what you REALLY want."
+                        exit 1
+                fi
+                mv /etc/selinux/config /etc/selinux/config.mdpbak
+                grep -v "^SELINUXTYPE" /etc/selinux/config.mdpbak >> /etc/selinux/config
+                echo "SELINUXTYPE=dummy" >> /etc/selinux/config
+        fi
+fi
+cd /etc/selinux/dummy/contexts/files
+$SF file_contexts /
+mounts=`cat /proc/$$/mounts | egrep "ext2|ext3|xfs|jfs|ext4|ext4dev|gfs2" | awk '{ print $2 '}`
+$SF file_contexts $mounts
+dodev=`cat /proc/$$/mounts | grep "/dev "`
+if [ "eq$dodev" != "eq" ]; then
+        mount --move /dev /mnt
+        $SF file_contexts /dev
+        mount --move /mnt /dev
+fi
diff --git a/scripts/selinux/mdp/.gitignore b/scripts/selinux/mdp/.gitignore
new file mode 100644
index 000000000000..654546d8dffd
--- /dev/null
+++ b/scripts/selinux/mdp/.gitignore
@@ -0,0 +1,2 @@
+# Generated file
+mdp
diff --git a/scripts/selinux/mdp/Makefile b/scripts/selinux/mdp/Makefile
new file mode 100644
index 000000000000..eb365b333441
--- /dev/null
+++ b/scripts/selinux/mdp/Makefile
@@ -0,0 +1,5 @@
+hostprogs-y     := mdp
+HOST_EXTRACFLAGS += -Isecurity/selinux/include
+always          := $(hostprogs-y)
+clean-files     := $(hostprogs-y) policy.* file_contexts
diff --git a/scripts/selinux/mdp/dbus_contexts b/scripts/selinux/mdp/dbus_contexts
new file mode 100644
index 000000000000..116e684f9fc1
--- /dev/null
+++ b/scripts/selinux/mdp/dbus_contexts
@@ -0,0 +1,6 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <selinux>
+  </selinux>
+</busconfig>
diff --git a/scripts/selinux/mdp/mdp.c b/scripts/selinux/mdp/mdp.c
new file mode 100644
index 000000000000..ca757d486187
--- /dev/null
+++ b/scripts/selinux/mdp/mdp.c
@@ -0,0 +1,242 @@
+/*
+ *
+ * mdp - make dummy policy
+ *
+ * When pointed at a kernel tree, builds a dummy policy for that kernel
+ * with exactly one type with full rights to itself.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Copyright (C) IBM Corporation, 2006
+ *
+ * Authors: Serge E. Hallyn <serue@us.ibm.com>
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include "flask.h"
+void usage(char *name)
+{
+        printf("usage: %s [-m] policy_file context_file\n", name);
+        exit(1);
+}
+void find_common_name(char *cname, char *dest, int len)
+{
+        char *start, *end;
+        start = strchr(cname, '_')+1;
+        end = strchr(start, '_');
+        if (!start || !end || start-cname > len || end-start > len) {
+                printf("Error with commons defines\n");
+                exit(1);
+        }
+        strncpy(dest, start, end-start);
+        dest[end-start] = '\0';
+}
+#define S_(x) x,
+static char *classlist[] = {
+#include "class_to_string.h"
+        NULL
+};
+#undef S_
+#include "initial_sid_to_string.h"
+#define TB_(x) char *x[] = {
+#define TE_(x) NULL };
+#define S_(x) x,
+#include "common_perm_to_string.h"
+#undef TB_
+#undef TE_
+#undef S_
+struct common {
+        char *cname;
+        char **perms;
+};
+struct common common[] = {
+#define TB_(x) { #x, x },
+#define S_(x)
+#define TE_(x)
+#include "common_perm_to_string.h"
+#undef TB_
+#undef TE_
+#undef S_
+};
+#define S_(x, y, z) {x, #y},
+struct av_inherit {
+        int class;
+        char *common;
+};
+struct av_inherit av_inherit[] = {
+#include "av_inherit.h"
+};
+#undef S_
+#include "av_permissions.h"
+#define S_(x, y, z) {x, y, z},
+struct av_perms {
+        int class;
+        int perm_i;
+        char *perm_s;
+};
+struct av_perms av_perms[] = {
+#include "av_perm_to_string.h"
+};
+#undef S_
+int main(int argc, char *argv[])
+{
+        int i, j, mls = 0;
+        char **arg, *polout, *ctxout;
+        int classlist_len, initial_sid_to_string_len;
+        FILE *fout;
+        if (argc < 3)
+                usage(argv[0]);
+        arg = argv+1;
+        if (argc==4 && strcmp(argv[1], "-m") == 0) {
+                mls = 1;
+                arg++;
+        }
+        polout = *arg++;
+        ctxout = *arg;
+        fout = fopen(polout, "w");
+        if (!fout) {
+                printf("Could not open %s for writing\n", polout);
+                usage(argv[0]);
+        }
+        classlist_len = sizeof(classlist) / sizeof(char *);
+        /* print out the classes */
+        for (i=1; i < classlist_len; i++) {
+                if(classlist[i])
+                        fprintf(fout, "class %s\n", classlist[i]);
+                else
+                        fprintf(fout, "class user%d\n", i);
+        }
+        fprintf(fout, "\n");
+        initial_sid_to_string_len = sizeof(initial_sid_to_string) / sizeof (char *);
+        /* print out the sids */
+        for (i=1; i < initial_sid_to_string_len; i++)
+                fprintf(fout, "sid %s\n", initial_sid_to_string[i]);
+        fprintf(fout, "\n");
+        /* print out the commons */
+        for (i=0; i< sizeof(common)/sizeof(struct common); i++) {
+                char cname[101];
+                find_common_name(common[i].cname, cname, 100);
+                cname[100] = '\0';
+                fprintf(fout, "common %s\n{\n", cname);
+                for (j=0; common[i].perms[j]; j++)
+                        fprintf(fout, "\t%s\n", common[i].perms[j]);
+                fprintf(fout, "}\n\n");
+        }
+        fprintf(fout, "\n");
+        /* print out the class permissions */
+        for (i=1; i < classlist_len; i++) {
+                if (classlist[i]) {
+                        int firstperm = -1, numperms = 0;
+                        fprintf(fout, "class %s\n", classlist[i]);
+                        /* does it inherit from a common? */
+                        for (j=0; j < sizeof(av_inherit)/sizeof(struct av_inherit); j++)
+                                if (av_inherit[j].class == i)
+                                        fprintf(fout, "inherits %s\n", av_inherit[j].common);
+                        for (j=0; j < sizeof(av_perms)/sizeof(struct av_perms); j++) {
+                                if (av_perms[j].class == i) {
+                                        if (firstperm == -1)
+                                                firstperm = j;
+                                        numperms++;
+                                }
+                        }
+                        if (!numperms) {
+                                fprintf(fout, "\n");
+                                continue;
+                        }
+                        fprintf(fout, "{\n");
+                        /* print out the av_perms */
+                        for (j=0; j < numperms; j++) {
+                                fprintf(fout, "\t%s\n", av_perms[firstperm+j].perm_s);
+                        }
+                        fprintf(fout, "}\n\n");
+                }
+        }
+        fprintf(fout, "\n");
+        /* NOW PRINT OUT MLS STUFF */
+        if (mls) {
+                printf("MLS not yet implemented\n");
+                exit(1);
+        }
+        /* types, roles, and allows */
+        fprintf(fout, "type base_t;\n");
+        fprintf(fout, "role base_r types { base_t };\n");
+        for (i=1; i < classlist_len; i++) {
+                if (classlist[i])
+                        fprintf(fout, "allow base_t base_t:%s *;\n", classlist[i]);
+                else
+                        fprintf(fout, "allow base_t base_t:user%d *;\n", i);
+        }
+        fprintf(fout, "user user_u roles { base_r };\n");
+        fprintf(fout, "\n");
+        /* default sids */
+        for (i=1; i < initial_sid_to_string_len; i++)
+                fprintf(fout, "sid %s user_u:base_r:base_t\n", initial_sid_to_string[i]);
+        fprintf(fout, "\n");
+        fprintf(fout, "fs_use_xattr ext2 user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_xattr ext3 user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_xattr jfs user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_xattr xfs user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_xattr reiserfs user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_task pipefs user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_task sockfs user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_trans devpts user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_trans tmpfs user_u:base_r:base_t;\n");
+        fprintf(fout, "fs_use_trans shm user_u:base_r:base_t;\n");
+        fprintf(fout, "genfscon proc / user_u:base_r:base_t\n");
+        fclose(fout);
+        fout = fopen(ctxout, "w");
+        if (!fout) {
+                printf("Wrote policy, but cannot open %s for writing\n", ctxout);
+                usage(argv[0]);
+        }
+        fprintf(fout, "/ user_u:base_r:base_t\n");
+        fprintf(fout, "/.* user_u:base_r:base_t\n");
+        fclose(fout);
+        return 0;
+}
author	Len Brown <len.brown@intel.com>	2008-10-22 23:57:26 -0400
committer	Len Brown <len.brown@intel.com>	2008-10-23 00:11:07 -0400
commit	057316cc6a5b521b332a1d7ccc871cd60c904c74 (patch)
tree	4333e608da237c73ff69b10878025cca96dcb4c8 /scripts
parent	3e2dab9a1c2deb03c311eb3f83466009147ed4d3 (diff)
parent	2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff)