[PATCH] ssb: Fix regression in 2.6.23-git3 due to change in calling add_uevent_var

[PATCH] ssb: Fix regression in 2.6.23-git3 due to change in calling add_uevent_var

[Larry Finger]

In commit 7eff2e7a8b65c25920207324e56611150eb1cd9a, the calling sequence
for add_uevent_var was changed, but the ssb driver was not modified, which
leads to a "Unable to handle kernel paging request" oops. This patch fixes
the problem.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
---

 drivers/ssb/main.c |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

Index: linux-2.6/drivers/ssb/main.c
===================================================================
--- linux-2.6.orig/drivers/ssb/main.c
+++ linux-2.6/drivers/ssb/main.c
@@ -320,22 +320,17 @@ static int ssb_bus_match(struct device *
 	return 0;
 }
 
-static int ssb_device_uevent(struct device *dev, char **envp, int num_envp,
-			     char *buffer, int buffer_size)
+static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
 	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
-	int ret, i = 0, length = 0;
+	int ret;
 
 	if (!dev)
 		return -ENODEV;
 
-	ret = add_uevent_var(envp, num_envp, &i,
-			     buffer, buffer_size, &length,
-			     "MODALIAS=ssb:v%04Xid%04Xrev%02X",
+	ret = add_uevent_var(env, "MODALIAS=ssb:v%04Xid%04Xrev%02X",
 			     ssb_dev->id.vendor, ssb_dev->id.coreid,
 			     ssb_dev->id.revision);
-	envp[i] = NULL;
-
 	return ret;
 }
 

Re: [PATCH] ssb: Fix regression in 2.6.23-git3 due to change in calling add_uevent_var

[Michael Buesch]

On Sunday 14 October 2007 06:46:47 Larry Finger wrote:
> In commit 7eff2e7a8b65c25920207324e56611150eb1cd9a, the calling sequence
> for add_uevent_var was changed, but the ssb driver was not modified, which
> leads to a "Unable to handle kernel paging request" oops. This patch fixes
> the problem.
> 
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Acked-by: Michael Buesch <mb@bu3sch.de>

> ---
> 
>  drivers/ssb/main.c |   11 +++--------
>  1 file changed, 3 insertions(+), 8 deletions(-)
> 
> Index: linux-2.6/drivers/ssb/main.c
> ===================================================================
> --- linux-2.6.orig/drivers/ssb/main.c
> +++ linux-2.6/drivers/ssb/main.c
> @@ -320,22 +320,17 @@ static int ssb_bus_match(struct device *
>  	return 0;
>  }
>  
> -static int ssb_device_uevent(struct device *dev, char **envp, int num_envp,
> -			     char *buffer, int buffer_size)
> +static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env)
>  {
>  	struct ssb_device *ssb_dev = dev_to_ssb_dev(dev);
> -	int ret, i = 0, length = 0;
> +	int ret;
>  
>  	if (!dev)
>  		return -ENODEV;
>  
> -	ret = add_uevent_var(envp, num_envp, &i,
> -			     buffer, buffer_size, &length,
> -			     "MODALIAS=ssb:v%04Xid%04Xrev%02X",
> +	ret = add_uevent_var(env, "MODALIAS=ssb:v%04Xid%04Xrev%02X",
>  			     ssb_dev->id.vendor, ssb_dev->id.coreid,
>  			     ssb_dev->id.revision);
> -	envp[i] = NULL;
> -
>  	return ret;
>  }
>  
> 
> 



-- 
Greetings Michael.

Re: [PATCH] ssb: Fix regression in 2.6.23-git3 due to change in calling add_uevent_var

[John W. Linville]

On Sat, Oct 13, 2007 at 11:46:47PM -0500, Larry Finger wrote:
> In commit 7eff2e7a8b65c25920207324e56611150eb1cd9a, the calling sequence
> for add_uevent_var was changed, but the ssb driver was not modified, which
> leads to a "Unable to handle kernel paging request" oops. This patch fixes
> the problem.

Sorry, Al Viro got a patch merged before I got to yours!

Thanks anyway!

John
-- 
John W. Linville
linville@tuxdriver.com