Commit ccb705af authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: 64-bit type cleanups

64-bit cleanliness - Fix the number of bits of the time_t field in the COW
header to be 32 and change an int to a longs.
Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 86999f87
...@@ -67,7 +67,7 @@ struct cow_header_v2 { ...@@ -67,7 +67,7 @@ struct cow_header_v2 {
struct cow_header_v3 { struct cow_header_v3 {
__u32 magic; __u32 magic;
__u32 version; __u32 version;
time_t mtime; __u32 mtime;
__u64 size; __u64 size;
__u32 sectorsize; __u32 sectorsize;
__u32 alignment; __u32 alignment;
......
...@@ -41,7 +41,7 @@ extern int is_tracing(void *task); ...@@ -41,7 +41,7 @@ extern int is_tracing(void *task);
extern int segv_syscall(void); extern int segv_syscall(void);
extern void kern_finish_exec(void *task, int new_pid, unsigned long stack); extern void kern_finish_exec(void *task, int new_pid, unsigned long stack);
extern int page_size(void); extern int page_size(void);
extern int page_mask(void); extern unsigned long page_mask(void);
extern int need_finish_fork(void); extern int need_finish_fork(void);
extern void free_stack(unsigned long stack, int order); extern void free_stack(unsigned long stack, int order);
extern void add_input_request(int op, void (*proc)(int), void *arg); extern void add_input_request(int op, void (*proc)(int), void *arg);
......
/* /*
* Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com) * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
* Copyright 2003 PathScale, Inc.
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -225,7 +226,7 @@ int page_size(void) ...@@ -225,7 +226,7 @@ int page_size(void)
return(PAGE_SIZE); return(PAGE_SIZE);
} }
int page_mask(void) unsigned long page_mask(void)
{ {
return(PAGE_MASK); return(PAGE_MASK);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment