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

Conflicts:

	drivers/usb/input/hid.h

8 files changed, 48 insertions, 18 deletions

diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 331c079f029b..4c723fd18648 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -158,7 +158,7 @@ unknown_option() {
 }
 
 list_header() {
-        echo "deps_initramfs := \\"
+        :
 }
 
 header() {
@@ -227,6 +227,7 @@ arg="$1"
 case "$arg" in
         "-l")   # files included in initramfs - used by kbuild
                 dep_list="list_"
+                echo "deps_initramfs := \\"
                 shift
                 ;;
         "-o")   # generate gzipped cpio image named $1
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 22d281c6ec24..f359b730c2c5 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -43,7 +43,7 @@ struct sym_entry {
 
 static struct sym_entry *table;
 static unsigned int table_size, table_cnt;
-static unsigned long long _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext;
+static unsigned long long _text, _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext;
 static int all_symbols = 0;
 static char symbol_prefix_char = '\0';
 
@@ -91,7 +91,9 @@ static int read_symbol(FILE *in, struct sym_entry *s)
                 sym++;
 
         /* Ignore most absolute/undefined (?) symbols. */
-        if (strcmp(sym, "_stext") == 0)
+        if (strcmp(sym, "_text") == 0)
+                _text = s->addr;
+        else if (strcmp(sym, "_stext") == 0)
                 _stext = s->addr;
         else if (strcmp(sym, "_etext") == 0)
                 _etext = s->addr;
@@ -265,9 +267,25 @@ static void write_src(void)
 
         printf(".data\n");
 
+        /* Provide proper symbols relocatability by their '_text'
+         * relativeness.  The symbol names cannot be used to construct
+         * normal symbol references as the list of symbols contains
+         * symbols that are declared static and are private to their
+         * .o files.  This prevents .tmp_kallsyms.o or any other
+         * object from referencing them.
+         */
         output_label("kallsyms_addresses");
         for (i = 0; i < table_cnt; i++) {
-                printf("\tPTR\t%#llx\n", table[i].addr);
+                if (toupper(table[i].sym[0]) != 'A') {
+                        if (_text <= table[i].addr)
+                                printf("\tPTR\t_text + %#llx\n",
+                                        table[i].addr - _text);
+                        else
+                                printf("\tPTR\t_text - %#llx\n",
+                                        _text - table[i].addr);
+                } else {
+                        printf("\tPTR\t%#llx\n", table[i].addr);
+                }
         }
         printf("\n");
 
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index e8ad1f6b3da4..b49584c932cc 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -6,6 +6,8 @@ lex.*.c
 *.tab.c
 *.tab.h
 zconf.hash.c
+*.moc
+lkc_defs.h
 
 #
 # configuration programs
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index ebc781b493d7..d54440fc166c 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -221,16 +221,14 @@ static void init_dialog_colors(void)
  */
 static void color_setup(const char *theme)
 {
-        if (set_theme(theme)) {
-                if (has_colors()) {     /* Terminal supports color? */
-                        start_color();
-                        init_dialog_colors();
-                }
-        }
-        else
-        {
+        int use_color;
+
+        use_color = set_theme(theme);
+        if (use_color && has_colors()) {
+                start_color();
+                init_dialog_colors();
+        } else
                 set_mono_theme();
-        }
 }
 
 /*
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 393f3749f330..f5628c57640b 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -798,7 +798,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                         QAction *action;
 
                         headerPopup = new QPopupMenu(this);
-                        action = new QAction("Show Name", 0, this);
+                        action = new QAction(NULL, "Show Name", 0, this);
                           action->setToggleAction(TRUE);
                           connect(action, SIGNAL(toggled(bool)),
                                   parent(), SLOT(setShowName(bool)));
@@ -806,7 +806,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                                   action, SLOT(setOn(bool)));
                           action->setOn(showName);
                           action->addTo(headerPopup);
-                        action = new QAction("Show Range", 0, this);
+                        action = new QAction(NULL, "Show Range", 0, this);
                           action->setToggleAction(TRUE);
                           connect(action, SIGNAL(toggled(bool)),
                                   parent(), SLOT(setShowRange(bool)));
@@ -814,7 +814,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                                   action, SLOT(setOn(bool)));
                           action->setOn(showRange);
                           action->addTo(headerPopup);
-                        action = new QAction("Show Data", 0, this);
+                        action = new QAction(NULL, "Show Data", 0, this);
                           action->setToggleAction(TRUE);
                           connect(action, SIGNAL(toggled(bool)),
                                   parent(), SLOT(setShowData(bool)));
@@ -1161,7 +1161,7 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
 QPopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos)
 {
         QPopupMenu* popup = Parent::createPopupMenu(pos);
-        QAction* action = new QAction("Show Debug Info", 0, popup);
+        QAction* action = new QAction(NULL,"Show Debug Info", 0, popup);
           action->setToggleAction(TRUE);
           connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool)));
           connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool)));
@@ -1259,6 +1259,7 @@ void ConfigSearchWindow::search(void)
  * Construct the complete config widget
  */
 ConfigMainWindow::ConfigMainWindow(void)
+        : searchWindow(0)
 {
         QMenuBar* menu;
         bool ok;
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 187f5de4612c..df3b272f7ce6 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1430,7 +1430,7 @@ sub create_parameterlist($$$) {
             # corresponding data structures "correctly". Catch it later in
             # output_* subs.
             push_parameter($arg, "", $file);
-        } elsif ($arg =~ m/\(/) {
+        } elsif ($arg =~ m/\(.*\*/) {
             # pointer-to-function
             $arg =~ tr/#/,/;
             $arg =~ m/[^\(]+\(\*([^\)]+)\)/;
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 2e1141623147..ac0a58222992 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -911,6 +911,7 @@ static int init_section_ref_ok(const char *name)
                 ".toc1",  /* used by ppc64 */
                 ".stab",
                 ".rodata",
+                ".parainstructions",
                 ".text.lock",
                 "__bug_table", /* used by powerpc for BUG() */
                 ".pci_fixup_header",
@@ -931,6 +932,7 @@ static int init_section_ref_ok(const char *name)
                 ".altinstructions",
                 ".eh_frame",
                 ".debug",
+                ".parainstructions",
                 NULL
         };
         /* part of section name */
diff --git a/scripts/ver_linux b/scripts/ver_linux
index 84999f69773d..72876dfadc8a 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -48,6 +48,8 @@ fsck.reiser4 -V 2>&1 | grep ^fsck.reiser4 | awk \
 xfs_db -V 2>&1 | grep version | awk \
 'NR==1{print "xfsprogs              ", $3}'
 
+pccardctl -V 2>&1| grep pcmciautils | awk '{print "pcmciautils           ", $2}'
+
 cardmgr -V 2>&1| grep version | awk \
 'NR==1{print "pcmcia-cs             ", $3}'
 
@@ -87,10 +89,16 @@ loadkeys -h 2>&1 | awk \
 loadkeys -V 2>&1 | awk \
 '(NR==1 && ($2 ~ /console-tools/)) {print "Console-tools         ", $3}'
 
+oprofiled --version 2>&1 | awk \
+'(NR==1 && ($2 == "oprofile")) {print "oprofile              ", $3}'
+
 expr --v 2>&1 | awk 'NR==1{print "Sh-utils              ", $NF}'
 
 udevinfo -V 2>&1 | grep version | awk '{print "udev                  ", $3}'
 
+iwconfig --version 2>&1 | awk \
+'(NR==1 && ($3 == "version")) {print "wireless-tools        ",$4}'
+
 if [ -e /proc/modules ]; then
     X=`cat /proc/modules | sed -e "s/ .*$//"`
     echo "Modules Loaded         "$X