Merge branch 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers into asm-generic

Patches from David Howells <dhowells@redhat.com>:

This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently.

Note that there are some fixup patches which are at the base of the
branch aimed at you, plus all arches get the asm-generic branch merged in too.

* 'disintegrate-asm-generic' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate include/asm-generic
  UAPI: Fix conditional header installation handling (notably kvm_para.h on m68k)
  c6x: remove c6x signal.h
  UAPI: Split compound conditionals containing __KERNEL__ in Arm64
  UAPI: Fix the guards on various asm/unistd.h files

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

3 files changed, 27 insertions, 80 deletions

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 097091059aaa..133f7de2a13d 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -66,7 +66,9 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 
 KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/include \
-                   -I$(HOST_DIR)/include/generated
+                   -I$(srctree)/$(HOST_DIR)/include/uapi \
+                   -I$(HOST_DIR)/include/generated \
+                   -I$(HOST_DIR)/include/generated/uapi
 
 # -Derrno=kernel_errno - This turns all kernel references to errno into
 # kernel_errno to separate them from the libc errno.  This allows -fno-common
diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
index bbaf2c59830a..457475f98414 100644
--- a/arch/um/drivers/line.c
+++ b/arch/um/drivers/line.c
@@ -409,7 +409,8 @@ int setup_one_line(struct line *lines, int n, char *init,
                 line->valid = 1;
                 err = parse_chan_pair(new, line, n, opts, error_out);
                 if (!err) {
-                        struct device *d = tty_register_device(driver, n, NULL);
+                        struct device *d = tty_port_register_device(&line->port,
+                                        driver, n, NULL);
                         if (IS_ERR(d)) {
                                 *error_out = "Failed to register device";
                                 err = PTR_ERR(d);
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index 664a60e8dfb4..9efeb6da48bc 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -21,6 +21,9 @@
 #include <linux/un.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
+#include <linux/fs.h>
+#include <linux/mount.h>
+#include <linux/file.h>
 #include <asm/uaccess.h>
 #include <asm/switch_to.h>
 
@@ -118,90 +121,38 @@ void mconsole_log(struct mc_request *req)
         mconsole_reply(req, "", 0, 0);
 }
 
-/* This is a more convoluted version of mconsole_proc, which has some stability
- * problems; however, we need it fixed, because it is expected that UML users
- * mount HPPFS instead of procfs on /proc. And we want mconsole_proc to still
- * show the real procfs content, not the ones from hppfs.*/
-#if 0
 void mconsole_proc(struct mc_request *req)
 {
         struct vfsmount *mnt = current->nsproxy->pid_ns->proc_mnt;
-        struct file *file;
-        int n;
-        char *ptr = req->request.data, *buf;
-        mm_segment_t old_fs = get_fs();
-
-        ptr += strlen("proc");
-        ptr = skip_spaces(ptr);
-
-        file = file_open_root(mnt->mnt_root, mnt, ptr, O_RDONLY);
-        if (IS_ERR(file)) {
-                mconsole_reply(req, "Failed to open file", 1, 0);
-                goto out;
-        }
-
-        buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
-        if (buf == NULL) {
-                mconsole_reply(req, "Failed to allocate buffer", 1, 0);
-                goto out_fput;
-        }
-
-        if (file->f_op->read) {
-                do {
-                        loff_t pos;
-                        set_fs(KERNEL_DS);
-                        n = vfs_read(file, buf, PAGE_SIZE - 1, &pos);
-                        file_pos_write(file, pos);
-                        set_fs(old_fs);
-                        if (n >= 0) {
-                                buf[n] = '\0';
-                                mconsole_reply(req, buf, 0, (n > 0));
-                        }
-                        else {
-                                mconsole_reply(req, "Read of file failed",
-                                               1, 0);
-                                goto out_free;
-                        }
-                } while (n > 0);
-        }
-        else mconsole_reply(req, "", 0, 0);
-
- out_free:
-        kfree(buf);
- out_fput:
-        fput(file);
- out: ;
-}
-#endif
-
-void mconsole_proc(struct mc_request *req)
-{
-        char path[64];
         char *buf;
         int len;
-        int fd;
+        struct file *file;
         int first_chunk = 1;
         char *ptr = req->request.data;
 
         ptr += strlen("proc");
         ptr = skip_spaces(ptr);
-        snprintf(path, sizeof(path), "/proc/%s", ptr);
 
-        fd = sys_open(path, 0, 0);
-        if (fd < 0) {
+        file = file_open_root(mnt->mnt_root, mnt, ptr, O_RDONLY);
+        if (IS_ERR(file)) {
                 mconsole_reply(req, "Failed to open file", 1, 0);
-                printk(KERN_ERR "open %s: %d\n",path,fd);
+                printk(KERN_ERR "open /proc/%s: %ld\n", ptr, PTR_ERR(file));
                 goto out;
         }
 
         buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
         if (buf == NULL) {
                 mconsole_reply(req, "Failed to allocate buffer", 1, 0);
-                goto out_close;
+                goto out_fput;
         }
 
-        for (;;) {
-                len = sys_read(fd, buf, PAGE_SIZE-1);
+        do {
+                loff_t pos;
+                mm_segment_t old_fs = get_fs();
+                set_fs(KERNEL_DS);
+                len = vfs_read(file, buf, PAGE_SIZE - 1, &pos);
+                set_fs(old_fs);
+                file->f_pos = pos;
                 if (len < 0) {
                         mconsole_reply(req, "Read of file failed", 1, 0);
                         goto out_free;
@@ -211,22 +162,14 @@ void mconsole_proc(struct mc_request *req)
                         mconsole_reply(req, "\n", 0, 1);
                         first_chunk = 0;
                 }
-                if (len == PAGE_SIZE-1) {
-                        buf[len] = '\0';
-                        mconsole_reply(req, buf, 0, 1);
-                } else {
-                        buf[len] = '\0';
-                        mconsole_reply(req, buf, 0, 0);
-                        break;
-                }
-        }
-
+                buf[len] = '\0';
+                mconsole_reply(req, buf, 0, (len > 0));
+        } while (len > 0);
  out_free:
         kfree(buf);
- out_close:
-        sys_close(fd);
- out:
-        /* nothing */;
+ out_fput:
+        fput(file);
+ out: ;
 }
 
 #define UML_MCONSOLE_HELPTEXT \
@@ -705,6 +648,7 @@ static void stack_proc(void *arg)
         struct task_struct *from = current, *to = arg;
 
         to->thread.saved_task = from;
+        rcu_switch(from, to);
         switch_to(from, to, from);
 }