Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[cascardo/linux.git] / arch / um / sys-x86_64 / bugs.c

diff --git a/arch/um/sys-x86_64/bugs.c b/arch/um/sys-x86_64/bugs.c
index 73ca623..0954788 100644 (file)
--- a/arch/um/sys-x86_64/bugs.c
+++ b/arch/um/sys-x86_64/bugs.c
@@ -4,12 +4,7 @@
  * Licensed under the GPL
  */
 
-#include "linux/sched.h"
-#include "linux/errno.h"
-#include "asm/system.h"
-#include "asm/pda.h"
 #include "sysdep/ptrace.h"
-#include "os.h"
 
 void arch_init_thread(void)
 {
@@ -21,79 +16,5 @@ void arch_check_bugs(void)
 
 int arch_handle_signal(int sig, union uml_pt_regs *regs)
 {
-       return(0);
+       return 0;
 }
-
-#define MAXTOKEN 64
-
-/* Set during early boot */
-int host_has_cmov = 1;
-int host_has_xmm = 0;
-
-static char token(int fd, char *buf, int len, char stop)
-{
-       int n;
-       char *ptr, *end, c;
-
-       ptr = buf;
-       end = &buf[len];
-       do {
-               n = os_read_file(fd, ptr, sizeof(*ptr));
-               c = *ptr++;
-               if(n != sizeof(*ptr)){
-                       if(n == 0) return(0);
-                       printk("Reading /proc/cpuinfo failed, err = %d\n", -n);
-                       if(n < 0)
-                               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);
-       }
-       *(ptr - 1) = '\0';
-       return(c);
-}
-
-static int find_cpuinfo_line(int fd, char *key, char *scratch, int len)
-{
-       int n;
-       char c;
-
-       scratch[len - 1] = '\0';
-       while(1){
-               c = token(fd, scratch, len - 1, ':');
-               if(c <= 0)
-                       return(0);
-               else if(c != ':'){
-                       printk("Failed to find ':' in /proc/cpuinfo\n");
-                       return(0);
-               }
-
-               if(!strncmp(scratch, key, strlen(key)))
-                       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);
-                       }
-               } while(c != '\n');
-       }
-       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:
- */