Skip to content

Commit

Permalink
uml: remove unused x86_64 code
Browse files Browse the repository at this point in the history
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 <jdike@linux.intel.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed May 7, 2007
1 parent 7f0536f commit f9d6e5f
Showing 1 changed file with 0 additions and 69 deletions.
69 changes: 0 additions & 69 deletions arch/um/sys-x86_64/bugs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
}

0 comments on commit f9d6e5f

Please sign in to comment.