- UML 64-bit type cleanups

PATCH In review Jeff Dike 1 participant 1 message Nov 12, 2004 User-mode Linux (UML)

Share & tools

Jeff Dike

author

2004-11-12 23:56 UTC #0 lore raw

PATCH 2/11 - 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 Jeff Dike <[email protected]>

arch/um/drivers/cow_user.c +1 -1

Index: 2.6.9/arch/um/drivers/cow_user.c
===================================================================
@@ -67,7 +67,7 @@
 struct cow_header_v3 {
 	__u32 magic;
 	__u32 version;
-	time_t mtime;
+	__u32 mtime;
 	__u64 size;
 	__u32 sectorsize;
 	__u32 alignment;

arch/um/include/kern_util.h +1 -1

Index: 2.6.9/arch/um/include/kern_util.h
===================================================================
@@ -41,7 +41,7 @@
 extern int segv_syscall(void);
 extern void kern_finish_exec(void *task, int new_pid, unsigned long stack);
 extern int page_size(void);
-extern int page_mask(void);
+extern unsigned long page_mask(void);
 extern int need_finish_fork(void);
 extern void free_stack(unsigned long stack, int order);
 extern void add_input_request(int op, void (*proc)(int), void *arg);

arch/um/kernel/process_kern.c +2 -1

Index: 2.6.9/arch/um/kernel/process_kern.c
===================================================================
@@ -1,5 +1,6 @@
 /* 
  * Copyright (C) 2000, 2001, 2002 Jeff Dike ([email protected])
+ * Copyright 2003 PathScale, Inc.
  * Licensed under the GPL
  */

@@ -225,7 +226,7 @@
 	return(PAGE_SIZE);
 }
 
-int page_mask(void)
+unsigned long page_mask(void)
 {
 	return(PAGE_MASK);
 }