nfs: disintegrate UAPI for nfs

This is to complete part of the Userspace API (UAPI) disintegration for which
the preparatory patches were pulled recently.  After these patches, userspace
headers will be segregated into:

        include/uapi/linux/.../foo.h

for the userspace interface stuff, and:

        include/linux/.../foo.h

for the strictly kernel internal stuff.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

2 files changed, 17 insertions, 0 deletions

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 7ed6864ef65b..df4fc23dd836 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -966,6 +966,21 @@ static int do_isapnp_entry(const char *filename,
 }
 ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry);
 
+/* Looks like: "ipack:fNvNdN". */
+static int do_ipack_entry(const char *filename,
+                          struct ipack_device_id *id, char *alias)
+{
+        id->vendor = TO_NATIVE(id->vendor);
+        id->device = TO_NATIVE(id->device);
+        strcpy(alias, "ipack:");
+        ADD(alias, "f", id->format != IPACK_ANY_FORMAT, id->format);
+        ADD(alias, "v", id->vendor != IPACK_ANY_ID, id->vendor);
+        ADD(alias, "d", id->device != IPACK_ANY_ID, id->device);
+        add_wildcard(alias);
+        return 1;
+}
+ADD_TO_DEVTABLE("ipack", struct ipack_device_id, do_ipack_entry);
+
 /*
  * Append a match expression for a single masked hex digit.
  * outp points to a pointer to the character at which to append.
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 68e9f5ed0a6f..00f7512a217f 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -827,6 +827,8 @@ static const char *section_white_list[] =
         ".note*",
         ".got*",
         ".toc*",
+        ".xt.prop",                              /* xtensa */
+        ".xt.lit",         /* xtensa */
         NULL
 };