projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'intx' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6
[powerpc.git]
/
drivers
/
atm
/
nicstar.c
diff --git
a/drivers/atm/nicstar.c
b/drivers/atm/nicstar.c
index
632ede5
..
bd09045
100644
(file)
--- a/
drivers/atm/nicstar.c
+++ b/
drivers/atm/nicstar.c
@@
-2759,7
+2759,7
@@
static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
{
ns_dev *card;
pool_levels pl;
{
ns_dev *card;
pool_levels pl;
-
int
btype;
+
long
btype;
unsigned long flags;
card = dev->dev_data;
unsigned long flags;
card = dev->dev_data;
@@
-2859,7
+2859,7
@@
static int ns_ioctl(struct atm_dev *dev, unsigned int cmd, void __user *arg)
case NS_ADJBUFLEV:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
case NS_ADJBUFLEV:
if (!capable(CAP_NET_ADMIN))
return -EPERM;
- btype = (
int) arg; /* an int is the same size as a point
er */
+ btype = (
long) arg; /* a long is the same size as a pointer or bigg
er */
switch (btype)
{
case NS_BUFTYPE_SMALL:
switch (btype)
{
case NS_BUFTYPE_SMALL: