maint: update for linux 4.5

* maint/ioctls_sym.sh: Update workarounds for drm/*_drm.h files.
Add workarounds for xen/gntdev.h and net/nfc/nci_core.h files.
Update path of saa6588.h and exynos-fimc.h files.

diff --git a/maint/ioctls_sym.sh b/maint/ioctls_sym.sh
index 3a802aefea3318b4e1ab42a0d02562dc129feb0a..c408b9142c3e7e02389462d89a7c16398926094a 100755 (executable)
--- a/maint/ioctls_sym.sh
+++ b/maint/ioctls_sym.sh
@@ -177,9 +177,12 @@ __EOF__
 #include <linux/serial.h>
 __EOF__
                        ;;
-               *drm/*_drm.h)
+               drm/sis_drm.h)
                        echo '#include <drm/drm.h>'
                        ;;
+               *drm/*_drm.h)
+                       echo '#include <drm/drm.h>' > "$tmpdir/drm.h"
+                       ;;
                fbio.h|*/fbio.h)
                        cat <<'__EOF__'
 #include <linux/fb.h>
@@ -228,7 +231,7 @@ __EOF__
                *linux/isdn_ppp.h|*linux/gsmmux.h)
                        echo '#include <linux/if.h>'
                        ;;
-               *media/saa6588.h)
+               *media*/saa6588.h)
                        echo 'typedef struct poll_table_struct poll_table;'
                        ;;
                *linux/ivtvfb.h|*linux/meye.h|*media/*.h)
@@ -298,6 +301,12 @@ __EOF__
                *video/sstfb.h)
                        echo 'struct fb_info;'
                        ;;
+               *xen/gntdev.h)
+                       cat <<'__EOF__'
+typedef uint32_t grant_ref_t;
+typedef uint16_t domid_t;
+__EOF__
+                       ;;
                *xen/interface/*.h)
                        return 0 # false positives
                        ;;
@@ -327,7 +336,7 @@ __EOF__
                mkdir -p "$tmpdir/${f%/*}"
        # Hard workarounds for some processed files.  Very fragile.
        case "$f" in
-               *acpi/*|*linux/i2o.h|*media/exynos-fimc.h|*media/v4l2-subdev.h|*net/bluetooth/*)
+               *acpi/*|*linux/i2o.h|*media*/exynos-fimc.h|*media/v4l2-subdev.h|*net/bluetooth/*|net/nfc/nci_core.h)
                        # Fetch macros only.
                        grep "${r_define}${r_cmd_name}" < "$s" > "$tmpdir/$f"
                        ;;