Merge commit 'origin/master' into next

This commit is contained in:
Benjamin Herrenschmidt
2009-11-24 17:16:30 +11:00
237 changed files with 2255 additions and 1580 deletions

View File

@@ -58,7 +58,7 @@ static int check_elf64(void *p, int size, struct addr_range *r)
return 64;
}
void get4k(FILE *file, char *buf )
static void get4k(FILE *file, char *buf )
{
unsigned j;
unsigned num = fread(buf, 1, 4096, file);
@@ -66,12 +66,12 @@ void get4k(FILE *file, char *buf )
buf[j] = 0;
}
void put4k(FILE *file, char *buf )
static void put4k(FILE *file, char *buf )
{
fwrite(buf, 1, 4096, file);
}
void death(const char *msg, FILE *fdesc, const char *fname)
static void death(const char *msg, FILE *fdesc, const char *fname)
{
fprintf(stderr, msg);
fclose(fdesc);