From: Jeff Dike Date: Sun, 6 May 2007 21:51:31 +0000 (-0700) Subject: uml: remove unused x86_64 code X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f9d6e5f83b40d8ff73a74d4bba2c5f51d6048b12;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git uml: remove unused x86_64 code It turns out that essentially none of the x86_64 bugs.c is needed. So, we can delete most of it. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/um/sys-x86_64/bugs.c b/arch/um/sys-x86_64/bugs.c index 9fa5392e3122..095478890371 100644 --- 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) { @@ -23,67 +18,3 @@ int arch_handle_signal(int sig, union uml_pt_regs *regs) { 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; -}