[PATCH] Fix compilation problem with 2.6.0-test2 on PPC

[PATCH] Fix compilation problem with 2.6.0-test2 on PPC

[Jocelyn Mayer]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

Hi,

There is a compilation issue in driver/input/evdev.c
due to the fact a "complex" expression is used as an argument
for an inline assembly construction (get_user)
The fix I done is to use a temporary variable to get the argument
and then use this variable for get_user.

--
Jocelyn Mayer <jma@netgem.com>

[-- Attachment #2: evdev.c.diff --]
[-- Type: text/plain, Size: 733 bytes --]

--- evdev.c.orig	Mon Jun 16 06:39:02 2003
+++ evdev.c	Thu Jul 31 02:41:35 2003
@@ -208,7 +208,7 @@
 	struct evdev *evdev = list->evdev;
 	struct input_dev *dev = evdev->handle.dev;
 	struct input_absinfo abs;
-	int i, t, u;
+	int i, t, u, v;

 	if (!evdev->exist) return -ENODEV;

@@ -240,7 +240,8 @@
 			if (get_user(t, ((int *) arg) + 0)) return -EFAULT;
 			if (t < 0 || t > dev->keycodemax || !dev->keycodesize) return -EINVAL;
 			u = INPUT_KEYCODE(dev, t);
-			if (get_user(INPUT_KEYCODE(dev, t), ((int *) arg) + 1)) return -EFAULT;
+                        v = INPUT_KEYCODE(dev, t);
+			if (get_user(v, ((int *) arg) + 1)) return -EFAULT;

 			for (i = 0; i < dev->keycodemax; i++)
 				if(INPUT_KEYCODE(dev, t) == u) break;

Re: [PATCH] Fix compilation problem with 2.6.0-test2 on PPC

[Vojtech Pavlik]

On Tue, Aug 05, 2003 at 10:11:36PM +0200, Jocelyn Mayer wrote:
> Hi,
>
> There is a compilation issue in driver/input/evdev.c
> due to the fact a "complex" expression is used as an argument
> for an inline assembly construction (get_user)
> The fix I done is to use a temporary variable to get the argument
> and then use this variable for get_user.
>
> --
> Jocelyn Mayer <jma@netgem.com>

> --- evdev.c.orig	Mon Jun 16 06:39:02 2003
> +++ evdev.c	Thu Jul 31 02:41:35 2003
> @@ -208,7 +208,7 @@
>  	struct evdev *evdev = list->evdev;
>  	struct input_dev *dev = evdev->handle.dev;
>  	struct input_absinfo abs;
> -	int i, t, u;
> +	int i, t, u, v;
>
>  	if (!evdev->exist) return -ENODEV;
>
> @@ -240,7 +240,8 @@
>  			if (get_user(t, ((int *) arg) + 0)) return -EFAULT;
>  			if (t < 0 || t > dev->keycodemax || !dev->keycodesize) return -EINVAL;
>  			u = INPUT_KEYCODE(dev, t);
> -			if (get_user(INPUT_KEYCODE(dev, t), ((int *) arg) + 1)) return -EFAULT;
> +                        v = INPUT_KEYCODE(dev, t);
> +			if (get_user(v, ((int *) arg) + 1)) return -EFAULT;
>
>  			for (i = 0; i < dev->keycodemax; i++)
>  				if(INPUT_KEYCODE(dev, t) == u) break;

Thanks, similar patch applied.

--
Vojtech Pavlik
SuSE Labs, SuSE CR

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/