drm: merge in Linus mainline

2 files changed, 50 insertions, 31 deletions

diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 9d67782b812f..a96153fc793f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -129,8 +129,8 @@ endif
 HOSTCFLAGS_lex.zconf.o  := -I$(src)
 HOSTCFLAGS_zconf.tab.o  := -I$(src)
 
-HOSTLOADLIBES_qconf     = -L$(QTLIBPATH) -Wl,-rpath,$(QTLIBPATH) -l$(LIBS_QT) -ldl
-HOSTCXXFLAGS_qconf.o    = -I$(QTDIR)/include -D LKC_DIRECT_LINK
+HOSTLOADLIBES_qconf     = $(KC_QT_LIBS) -ldl
+HOSTCXXFLAGS_qconf.o    = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
 
 HOSTLOADLIBES_gconf     = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --libs`
 HOSTCFLAGS_gconf.o      = `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` \
@@ -139,40 +139,50 @@ HOSTCFLAGS_gconf.o	= `pkg-config gtk+-2.0 gmodule-2.0 libglade-2.0 --cflags` \
 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
 
 ifeq ($(qconf-target),1)
-MOC = $(QTDIR)/bin/moc
-QTLIBPATH = $(QTDIR)/lib
+$(obj)/.tmp_qtcheck: $(src)/Makefile
 -include $(obj)/.tmp_qtcheck
 
 # QT needs some extra effort...
 $(obj)/.tmp_qtcheck:
-        @set -e; for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
-          if [ -f $$d/include/qconfig.h ]; then DIR=$$d; break; fi; \
-        done; \
-        if [ -z "$$DIR" ]; then \
-          echo "*"; \
-          echo "* Unable to find the QT installation. Please make sure that the"; \
-          echo "* QT development package is correctly installed and the QTDIR"; \
-          echo "* environment variable is set to the correct location."; \
-          echo "*"; \
-          false; \
-        fi; \
-        LIBPATH=$$DIR/lib; LIB=qt; \
-        if [ -f $$QTLIB/libqt-mt.so ] ; then \
-                LIB=qt-mt; \
-                LIBPATH=$$QTLIB; \
+        @set -e; echo "  CHECK   qt"; dir=""; pkg=""; \
+        pkg-config --exists qt 2> /dev/null && pkg=qt; \
+        pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
+        if [ -n "$$pkg" ]; then \
+          cflags="\$$(shell pkg-config $$pkg --cflags)"; \
+          libs="\$$(shell pkg-config $$pkg --libs)"; \
+          moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
+          dir="$$(pkg-config $$pkg --variable=prefix)"; \
         else \
-                $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
-                LIBPATH=$$DIR/lib/$$($(HOSTCXX) -print-multi-os-directory); \
-                if [ -f $$LIBPATH/libqt-mt.so ]; then LIB=qt-mt; fi; \
+          for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+            if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
+          done; \
+          if [ -z "$$dir" ]; then \
+            echo "*"; \
+            echo "* Unable to find the QT installation. Please make sure that"; \
+            echo "* the QT development package is correctly installed and"; \
+            echo "* either install pkg-config or set the QTDIR environment"; \
+            echo "* variable to the correct location."; \
+            echo "*"; \
+            false; \
+          fi; \
+          libpath=$$dir/lib; lib=qt; osdir=""; \
+          $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
+            osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
+          test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
+          test -f $$libpath/libqt-mt.so && lib=qt-mt; \
+          cflags="-I$$dir/include"; \
+          libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
+          moc="$$dir/bin/moc"; \
         fi; \
-        echo "QTDIR=$$DIR" > $@; echo "QTLIBPATH=$$LIBPATH" >> $@; \
-        echo "LIBS_QT=$$LIB" >> $@; \
-        if [ ! -x $$DIR/bin/moc -a -x /usr/bin/moc ]; then \
+        if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
           echo "*"; \
-          echo "* Unable to find $$DIR/bin/moc, using /usr/bin/moc instead."; \
+          echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
           echo "*"; \
-          echo "MOC=/usr/bin/moc" >> $@; \
-        fi
+          moc="/usr/bin/moc"; \
+        fi; \
+        echo "KC_QT_CFLAGS=$$cflags" > $@; \
+        echo "KC_QT_LIBS=$$libs" >> $@; \
+        echo "KC_QT_MOC=$$moc" >> $@
 endif
 
 $(obj)/gconf.o: $(obj)/.tmp_gtkcheck
@@ -210,7 +220,7 @@ $(obj)/qconf.o: $(obj)/qconf.moc $(obj)/lkc_defs.h
 $(obj)/gconf.o: $(obj)/lkc_defs.h
 
 $(obj)/%.moc: $(src)/%.h
-        $(MOC) -i $< -o $@
+        $(KC_QT_MOC) -i $< -o $@
 
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
         sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 8aaf74e64183..2f45fd2969d0 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -117,6 +117,8 @@ use strict;
 # struct my_struct {
 #     int a;
 #     int b;
+# /* private: */
+#     int c;
 # };
 #
 # All descriptions can be multiline, except the short function description.
@@ -1304,6 +1306,12 @@ sub dump_struct($$) {
         # ignore embedded structs or unions
         $members =~ s/{.*?}//g;
 
+        # ignore members marked private:
+        $members =~ s/\/\*.*?private:.*?public:.*?\*\///gos;
+        $members =~ s/\/\*.*?private:.*//gos;
+        # strip comments:
+        $members =~ s/\/\*.*?\*\///gos;
+
         create_parameterlist($members, ';', $file);
 
         output_declaration($declaration_name,
@@ -1329,6 +1337,7 @@ sub dump_enum($$) {
     my $x = shift;
     my $file = shift;
 
+    $x =~ s@/\*.*?\*/@@gos;     # strip comments.
     if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
         $declaration_name = $1;
         my $members = $2;
@@ -1365,6 +1374,7 @@ sub dump_typedef($$) {
     my $x = shift;
     my $file = shift;
 
+    $x =~ s@/\*.*?\*/@@gos;     # strip comments.
     while (($x =~ /\(*.\)\s*;$/) || ($x =~ /\[*.\]\s*;$/)) {
         $x =~ s/\(*.\)\s*;$/;/;
         $x =~ s/\[*.\]\s*;$/;/;
@@ -1420,7 +1430,7 @@ sub create_parameterlist($$$) {
             $type = $arg;
             $type =~ s/([^\(]+\(\*)$param/$1/;
             push_parameter($param, $type, $file);
-        } else {
+        } elsif ($arg) {
             $arg =~ s/\s*:\s*/:/g;
             $arg =~ s/\s*\[/\[/g;
 
@@ -1628,7 +1638,6 @@ sub process_state3_type($$) {
     my $x = shift;
     my $file = shift;
 
-    $x =~ s@/\*.*?\*/@@gos;     # strip comments.
     $x =~ s@[\r\n]+@ @gos; # strip newlines/cr's.
     $x =~ s@^\s+@@gos; # strip leading spaces
     $x =~ s@\s+$@@gos; # strip trailing spaces