Merge branch 'linux-2.6'

6 files changed, 85 insertions, 133 deletions

diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index f1bcd399ac90..0393e44813e7 100644
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -13,7 +13,6 @@
 #include "sysdep/ptrace.h"
 #include "task.h"
 #include "os.h"
-#include "user_util.h"
 
 #define MAXTOKEN 64
 
@@ -32,21 +31,21 @@ static char token(int fd, char *buf, int len, char stop)
                 n = os_read_file(fd, ptr, sizeof(*ptr));
                 c = *ptr++;
                 if(n != sizeof(*ptr)){
-                        if(n == 0) return(0);
+                        if(n == 0)
+                                return 0;
                         printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
                         if(n < 0)
-                                return(n);
-                        else
-                                return(-EIO);
+                                return n;
+                        else return -EIO;
                 }
         } while((c != '\n') && (c != stop) && (ptr < end));
 
         if(ptr == end){
                 printk("Failed to find '%c' in /proc/cpuinfo\n", stop);
-                return(-1);
+                return -1;
         }
         *(ptr - 1) = '\0';
-        return(c);
+        return c;
 }
 
 static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
@@ -58,48 +57,25 @@ static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
         while(1){
                 c = token(fd, scratch, len - 1, ':');
                 if(c <= 0)
-                        return(0);
+                        return 0;
                 else if(c != ':'){
                         printk("Failed to find ':' in /proc/cpuinfo\n");
-                        return(0);
+                        return 0;
                 }
 
                 if(!strncmp(scratch, key, strlen(key)))
-                        return(1);
+                        return 1;
 
                 do {
                         n = os_read_file(fd, &c, sizeof(c));
                         if(n != sizeof(c)){
                                 printk("Failed to find newline in "
                                        "/proc/cpuinfo, err = %d\n", -n);
-                                return(0);
+                                return 0;
                         }
                 } while(c != '\n');
         }
-        return(0);
-}
-
-int cpu_feature(char *what, char *buf, int len)
-{
-        int fd, ret = 0;
-
-        fd = os_open_file("/proc/cpuinfo", of_read(OPENFLAGS()), 0);
-        if(fd < 0){
-                printk("Couldn't open /proc/cpuinfo, err = %d\n", -fd);
-                return(0);
-        }
-
-        if(!find_cpuinfo_line(fd, what, buf, len)){
-                printk("Couldn't find '%s' line in /proc/cpuinfo\n", what);
-                goto out_close;
-        }
-
-        token(fd, buf, len, '\n');
-        ret = 1;
-
- out_close:
-        os_close_file(fd);
-        return(ret);
+        return 0;
 }
 
 static int check_cpu_flag(char *feature, int *have_it)
@@ -119,7 +95,8 @@ static int check_cpu_flag(char *feature, int *have_it)
                 goto out;
 
         c = token(fd, buf, len - 1, ' ');
-        if(c < 0) goto out;
+        if(c < 0)
+                goto out;
         else if(c != ' '){
                 printk("Failed to find ' ' in /proc/cpuinfo\n");
                 goto out;
@@ -127,7 +104,8 @@ static int check_cpu_flag(char *feature, int *have_it)
 
         while(1){
                 c = token(fd, buf, len - 1, ' ');
-                if(c < 0) goto out;
+                if(c < 0)
+                        goto out;
                 else if(c == '\n') break;
 
                 if(!strcmp(buf, feature)){
@@ -136,8 +114,10 @@ static int check_cpu_flag(char *feature, int *have_it)
                 }
         }
  out:
-        if(*have_it == 0) printk("No\n");
-        else if(*have_it == 1) printk("Yes\n");
+        if(*have_it == 0)
+                printk("No\n");
+        else if(*have_it == 1)
+                printk("Yes\n");
         os_close_file(fd);
         return 1;
 }
@@ -189,12 +169,13 @@ int arch_handle_signal(int sig, union uml_pt_regs *regs)
         /* This is testing for a cmov (0x0f 0x4x) instruction causing a
          * SIGILL in init.
          */
-        if((sig != SIGILL) || (TASK_PID(get_current()) != 1)) return(0);
+        if((sig != SIGILL) || (TASK_PID(get_current()) != 1))
+                return 0;
 
         if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2))
                 panic("SIGILL in init, could not read instructions!\n");
         if((tmp[0] != 0x0f) || ((tmp[1] & 0xf0) != 0x40))
-                return(0);
+                return 0;
 
         if(host_has_cmov == 0)
                 panic("SIGILL caused by cmov, which this processor doesn't "
@@ -208,16 +189,5 @@ int arch_handle_signal(int sig, union uml_pt_regs *regs)
                       "implements it, boot a filesystem compiled for older "
                       "processors");
         else panic("Bad value for host_has_cmov (%d)", host_has_cmov);
-        return(0);
+        return 0;
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/sys-i386/fault.c b/arch/um/sys-i386/fault.c
index d0bbcdfdb53f..745b4fd49e9f 100644
--- a/arch/um/sys-i386/fault.c
+++ b/arch/um/sys-i386/fault.c
@@ -3,9 +3,7 @@
  * Licensed under the GPL
  */
 
-#include <signal.h>
 #include "sysdep/ptrace.h"
-#include "sysdep/sigcontext.h"
 
 /* These two are from asm-um/uaccess.h and linux/module.h, check them. */
 struct exception_table_entry
@@ -17,26 +15,14 @@ struct exception_table_entry
 const struct exception_table_entry *search_exception_tables(unsigned long add);
 
 /* Compare this to arch/i386/mm/extable.c:fixup_exception() */
-int arch_fixup(unsigned long address, void *sc_ptr)
+int arch_fixup(unsigned long address, union uml_pt_regs *regs)
 {
-        struct sigcontext *sc = sc_ptr;
         const struct exception_table_entry *fixup;
 
         fixup = search_exception_tables(address);
         if(fixup != 0){
-                sc->eip = fixup->fixup;
+                UPT_IP(regs) = fixup->fixup;
                 return(1);
         }
         return(0);
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 01212c88fcc4..40ff0c831bd0 100644
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
  * Licensed under the GPL
  */
@@ -15,7 +15,6 @@
 #include "user.h"
 #include "os.h"
 #include "uml-config.h"
-#include "user_util.h"
 
 int ptrace_getregs(long pid, unsigned long *regs_out)
 {
@@ -45,7 +44,8 @@ int ptrace_setfpregs(long pid, unsigned long *regs)
         return 0;
 }
 
-/* All the below stuff is of interest for TT mode only */
+#ifdef UML_CONFIG_MODE_TT
+
 static void write_debugregs(int pid, unsigned long *regs)
 {
         struct user *dummy;
@@ -128,13 +128,4 @@ void update_debugregs(int seq)
 }
 #endif
 
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
+#endif
diff --git a/arch/um/sys-i386/signal.c b/arch/um/sys-i386/signal.c
index 3f6acd667717..1cbf95f6858a 100644
--- a/arch/um/sys-i386/signal.c
+++ b/arch/um/sys-i386/signal.c
@@ -18,6 +18,28 @@
 
 #include "skas.h"
 
+void copy_sc(union uml_pt_regs *regs, void *from)
+{
+        struct sigcontext *sc = from;
+
+        REGS_GS(regs->skas.regs) = sc->gs;
+        REGS_FS(regs->skas.regs) = sc->fs;
+        REGS_ES(regs->skas.regs) = sc->es;
+        REGS_DS(regs->skas.regs) = sc->ds;
+        REGS_EDI(regs->skas.regs) = sc->edi;
+        REGS_ESI(regs->skas.regs) = sc->esi;
+        REGS_EBP(regs->skas.regs) = sc->ebp;
+        REGS_SP(regs->skas.regs) = sc->esp;
+        REGS_EBX(regs->skas.regs) = sc->ebx;
+        REGS_EDX(regs->skas.regs) = sc->edx;
+        REGS_ECX(regs->skas.regs) = sc->ecx;
+        REGS_EAX(regs->skas.regs) = sc->eax;
+        REGS_IP(regs->skas.regs) = sc->eip;
+        REGS_CS(regs->skas.regs) = sc->cs;
+        REGS_EFLAGS(regs->skas.regs) = sc->eflags;
+        REGS_SS(regs->skas.regs) = sc->ss;
+}
+
 static int copy_sc_from_user_skas(struct pt_regs *regs,
                                   struct sigcontext __user *from)
 {
@@ -28,33 +50,18 @@ static int copy_sc_from_user_skas(struct pt_regs *regs,
         err = copy_from_user(&sc, from, sizeof(sc));
         err |= copy_from_user(fpregs, sc.fpstate, sizeof(fpregs));
         if(err)
-                return(err);
-
-        REGS_GS(regs->regs.skas.regs) = sc.gs;
-        REGS_FS(regs->regs.skas.regs) = sc.fs;
-        REGS_ES(regs->regs.skas.regs) = sc.es;
-        REGS_DS(regs->regs.skas.regs) = sc.ds;
-        REGS_EDI(regs->regs.skas.regs) = sc.edi;
-        REGS_ESI(regs->regs.skas.regs) = sc.esi;
-        REGS_EBP(regs->regs.skas.regs) = sc.ebp;
-        REGS_SP(regs->regs.skas.regs) = sc.esp;
-        REGS_EBX(regs->regs.skas.regs) = sc.ebx;
-        REGS_EDX(regs->regs.skas.regs) = sc.edx;
-        REGS_ECX(regs->regs.skas.regs) = sc.ecx;
-        REGS_EAX(regs->regs.skas.regs) = sc.eax;
-        REGS_IP(regs->regs.skas.regs) = sc.eip;
-        REGS_CS(regs->regs.skas.regs) = sc.cs;
-        REGS_EFLAGS(regs->regs.skas.regs) = sc.eflags;
-        REGS_SS(regs->regs.skas.regs) = sc.ss;
+                return err;
+
+        copy_sc(&regs->regs, &sc);
 
         err = restore_fp_registers(userspace_pid[0], fpregs);
-        if(err < 0){
+        if(err < 0) {
                 printk("copy_sc_from_user_skas - PTRACE_SETFPREGS failed, "
-                       "errno = %d\n", err);
-                return(1);
+                       "errno = %d\n", -err);
+                return err;
         }
 
-        return(0);
+        return 0;
 }
 
 int copy_sc_to_user_skas(struct sigcontext __user *to, struct _fpstate __user *to_fp,
@@ -90,16 +97,16 @@ int copy_sc_to_user_skas(struct sigcontext __user *to, struct _fpstate __user *t
         if(err < 0){
                 printk("copy_sc_to_user_skas - PTRACE_GETFPREGS failed, "
                        "errno = %d\n", err);
-                return(1);
+                return 1;
         }
         to_fp = (to_fp ? to_fp : (struct _fpstate __user *) (to + 1));
         sc.fpstate = to_fp;
 
         if(err)
-                return(err);
+                return err;
 
-        return(copy_to_user(to, &sc, sizeof(sc)) ||
-               copy_to_user(to_fp, fpregs, sizeof(fpregs)));
+        return copy_to_user(to, &sc, sizeof(sc)) ||
+               copy_to_user(to_fp, fpregs, sizeof(fpregs));
 }
 #endif
 
@@ -129,7 +136,7 @@ int copy_sc_from_user_tt(struct sigcontext *to, struct sigcontext __user *from,
         to->fpstate = to_fp;
         if(to_fp != NULL)
                 err |= copy_from_user(to_fp, from_fp, fpsize);
-        return(err);
+        return err;
 }
 
 int copy_sc_to_user_tt(struct sigcontext __user *to, struct _fpstate __user *fp,
@@ -164,15 +171,15 @@ static int copy_sc_from_user(struct pt_regs *to, void __user *from)
         ret = CHOOSE_MODE(copy_sc_from_user_tt(UPT_SC(&to->regs), from,
                                                sizeof(struct _fpstate)),
                           copy_sc_from_user_skas(to, from));
-        return(ret);
+        return ret;
 }
 
 static int copy_sc_to_user(struct sigcontext __user *to, struct _fpstate __user *fp,
                            struct pt_regs *from, unsigned long sp)
 {
-        return(CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs),
+        return CHOOSE_MODE(copy_sc_to_user_tt(to, fp, UPT_SC(&from->regs),
                                               sizeof(*fp), sp),
-                           copy_sc_to_user_skas(to, fp, from, sp)));
+                           copy_sc_to_user_skas(to, fp, from, sp));
 }
 
 static int copy_ucontext_to_user(struct ucontext __user *uc, struct _fpstate __user *fp,
@@ -185,7 +192,7 @@ static int copy_ucontext_to_user(struct ucontext __user *uc, struct _fpstate __u
         err |= put_user(current->sas_ss_size, &uc->uc_stack.ss_size);
         err |= copy_sc_to_user(&uc->uc_mcontext, fp, &current->thread.regs, sp);
         err |= copy_to_user(&uc->uc_sigmask, set, sizeof(*set));
-        return(err);
+        return err;
 }
 
 struct sigframe
@@ -359,7 +366,7 @@ long sys_sigreturn(struct pt_regs regs)
 
         /* Avoid ERESTART handling */
         PT_REGS_SYSCALL_NR(&current->thread.regs) = -1;
-        return(PT_REGS_SYSCALL_RET(&current->thread.regs));
+        return PT_REGS_SYSCALL_RET(&current->thread.regs);
 
  segfault:
         force_sig(SIGSEGV, current);
@@ -389,20 +396,9 @@ long sys_rt_sigreturn(struct pt_regs regs)
 
         /* Avoid ERESTART handling */
         PT_REGS_SYSCALL_NR(&current->thread.regs) = -1;
-        return(PT_REGS_SYSCALL_RET(&current->thread.regs));
+        return PT_REGS_SYSCALL_RET(&current->thread.regs);
 
  segfault:
         force_sig(SIGSEGV, current);
         return 0;
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
diff --git a/arch/um/sys-i386/tls.c b/arch/um/sys-i386/tls.c
index 643dab585727..fea8e5e15cc4 100644
--- a/arch/um/sys-i386/tls.c
+++ b/arch/um/sys-i386/tls.c
@@ -23,9 +23,13 @@
 #include "skas.h"
 #endif
 
-/* If needed we can detect when it's uninitialized. */
+/*
+ * If needed we can detect when it's uninitialized.
+ *
+ * These are initialized in an initcall and unchanged thereafter.
+ */
 static int host_supports_tls = -1;
-int host_gdt_entry_tls_min = -1;
+int host_gdt_entry_tls_min;
 
 #ifdef CONFIG_MODE_SKAS
 int do_set_thread_area_skas(struct user_desc *info)
@@ -361,7 +365,8 @@ out:
 
 /* XXX: This part is probably common to i386 and x86-64. Don't create a common
  * file for now, do that when implementing x86-64 support.*/
-static int __init __setup_host_supports_tls(void) {
+static int __init __setup_host_supports_tls(void)
+{
         check_host_supports_tls(&host_supports_tls, &host_gdt_entry_tls_min);
         if (host_supports_tls) {
                 printk(KERN_INFO "Host TLS support detected\n");
diff --git a/arch/um/sys-i386/user-offsets.c b/arch/um/sys-i386/user-offsets.c
index 447306b20aea..29118cf5ff25 100644
--- a/arch/um/sys-i386/user-offsets.c
+++ b/arch/um/sys-i386/user-offsets.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
+#include <stddef.h>
 #include <signal.h>
+#include <sys/poll.h>
+#include <sys/mman.h>
 #include <asm/ptrace.h>
 #include <asm/user.h>
-#include <stddef.h>
-#include <sys/poll.h>
 
 #define DEFINE(sym, val) \
         asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -47,7 +48,6 @@ void foo(void)
         OFFSET(HOST_SC_FP_ST, _fpstate, _st);
         OFFSET(HOST_SC_FXSR_ENV, _fpstate, _fxsr_env);
 
-        DEFINE(HOST_FRAME_SIZE, FRAME_SIZE);
         DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_i387_struct));
         DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fxsr_struct));
 
@@ -73,4 +73,8 @@ void foo(void)
         DEFINE(UM_POLLIN, POLLIN);
         DEFINE(UM_POLLPRI, POLLPRI);
         DEFINE(UM_POLLOUT, POLLOUT);
+
+        DEFINE(UM_PROT_READ, PROT_READ);
+        DEFINE(UM_PROT_WRITE, PROT_WRITE);
+        DEFINE(UM_PROT_EXEC, PROT_EXEC);
 }