From 8c0024daf35038dd11918705f723d30b5ebe0535 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 20 Sep 2010 08:42:17 +0000 Subject: [PATCH] --- yaml --- r: 214584 b: refs/heads/master c: a77f5db361ed9953b5b749353ea2c7fed2bf8d93 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/ethtool.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 814aff20c0b3..2f3379554520 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6099e3dea9aaa6127cea0610533221c9e956f009 +refs/heads/master: a77f5db361ed9953b5b749353ea2c7fed2bf8d93 diff --git a/trunk/net/core/ethtool.c b/trunk/net/core/ethtool.c index 91ffce20c36b..dae2fd053c2b 100644 --- a/trunk/net/core/ethtool.c +++ b/trunk/net/core/ethtool.c @@ -815,7 +815,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) if (regs.len > reglen) regs.len = reglen; - regbuf = kmalloc(reglen, GFP_USER); + regbuf = vmalloc(reglen); if (!regbuf) return -ENOMEM; @@ -830,7 +830,7 @@ static int ethtool_get_regs(struct net_device *dev, char __user *useraddr) ret = 0; out: - kfree(regbuf); + vfree(regbuf); return ret; }