[parisc-linux] fdisk problems 2.4 <-> 2.6

[Joel Soete]

Any way, should it be this stuff (I don't notice it before):
----------><----------
--- uaccess.h.orig	2004-04-20 19:58:08.000000000 +0200
+++ uaccess.h-t1	2004-04-20 20:10:09.000000000 +0200
@@ -42,8 +42,8 @@
  #if BITS_PER_LONG == 32
  #define LDD_KERNEL(ptr) __get_kernel_bad();
  #define LDD_USER(ptr) __get_user_bad();
-#define STD_KERNEL(x, ptr) __put_kernel_asm64((u32)x,ptr)
-#define STD_USER(x, ptr) __put_user_asm64((u32)x,ptr)
+#define STD_KERNEL(x, ptr) __put_kernel_asm64(x,ptr)
+#define STD_USER(x, ptr) __put_user_asm64(x,ptr)
  #else
  #define LDD_KERNEL(ptr) __get_kernel_asm("ldd",ptr)
  #define LDD_USER(ptr) __get_user_asm("ldd",ptr)
----------><----------

But I presume it should reuired some cast so would it be better:
----------><----------
--- uaccess.h.orig	2004-04-20 19:58:08.000000000 +0200
+++ uaccess.h-t2	2004-04-20 20:10:41.000000000 +0200
@@ -42,8 +42,8 @@
  #if BITS_PER_LONG == 32
  #define LDD_KERNEL(ptr) __get_kernel_bad();
  #define LDD_USER(ptr) __get_user_bad();
-#define STD_KERNEL(x, ptr) __put_kernel_asm64((u32)x,ptr)
-#define STD_USER(x, ptr) __put_user_asm64((u32)x,ptr)
+#define STD_KERNEL(x, ptr) __put_kernel_asm64((u64)x,ptr)
+#define STD_USER(x, ptr) __put_user_asm64((u64)x,ptr)
  #else
  #define LDD_KERNEL(ptr) __get_kernel_asm("ldd",ptr)
  #define LDD_USER(ptr) __get_user_asm("ldd",ptr)
----------><----------

I don't test it but hth,
	Joel



Grant Grundler wrote:
> On Sat, Nov 08, 2003 at 10:59:20AM +0000, Joel Soete wrote:
> 
>>IIRC include/asm-parisc/uaccess.h
> 
> 
> get/put user stuff looks the same to me in both 2.4/2.6 cvs.
> I'm likely to forget forward porting 2.4 changes to 2.6 but I thought
> I got that in the last round. If someone trolls the parisc-linux-cvs
> archive and compares my commits for the past 2-3 monthes...
> 
> thanks,
> grant
>