From: Tony Lindgren Date: Mon, 29 Oct 2007 14:14:58 +0000 (-0700) Subject: ARM: OMAP: Misc compile fixes after updating to current mainline tree X-Git-Tag: v2.6.24-omap1~259 X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=dff99b718dffb5c041c99eebb3607f411d377f4d;p=linux-2.6-omap-h63xx.git ARM: OMAP: Misc compile fixes after updating to current mainline tree Misc compile fixes after updating to current mainline tree Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/dsp/task.c b/arch/arm/plat-omap/dsp/task.c index 2b2ab76189f..e5ee8e0e216 100644 --- a/arch/arm/plat-omap/dsp/task.c +++ b/arch/arm/plat-omap/dsp/task.c @@ -2831,7 +2831,7 @@ static ssize_t proc_list_show(struct device *d, struct device_attribute *attr, list_for_each_entry(pl, &dev->proc_list, list_head) { /* need to lock tasklist_lock before calling * find_task_by_pid_type. */ - if (find_task_by_pid_type(PIDTYPE_PID, pl->pid) != NULL) + if (find_task_by_pid(pl->pid) != NULL) len += sprintf(buf + len, "%d\n", pl->pid); read_unlock(&tasklist_lock); } diff --git a/arch/arm/plat-omap/sti/sti-netlink.c b/arch/arm/plat-omap/sti/sti-netlink.c index aed89da655e..ca3533e7519 100644 --- a/arch/arm/plat-omap/sti/sti-netlink.c +++ b/arch/arm/plat-omap/sti/sti-netlink.c @@ -123,25 +123,18 @@ static int sti_netlink_receive_skb(struct sk_buff *skb) return 0; } -static void sti_netlink_receive(struct sock *sk, int len) +static void sti_netlink_receive(struct sk_buff *skb) { - struct sk_buff *skb; - if (!mutex_trylock(&sti_netlink_mutex)) return; - while ((skb = skb_dequeue(&sk->sk_receive_queue))) - if (sti_netlink_receive_skb(skb) && skb->len) - skb_queue_head(&sk->sk_receive_queue, skb); - else - kfree_skb(skb); - + sti_netlink_receive_skb(skb); mutex_unlock(&sti_netlink_mutex); } static int __init sti_netlink_init(void) { - sti_sock = netlink_kernel_create(NETLINK_USERSOCK, 0, + sti_sock = netlink_kernel_create(&init_net, NETLINK_USERSOCK, 0, sti_netlink_receive, NULL, THIS_MODULE); if (!sti_sock) { diff --git a/drivers/cbus/retu-pwrbutton.c b/drivers/cbus/retu-pwrbutton.c index ad37b6d051b..283d9cae7b0 100644 --- a/drivers/cbus/retu-pwrbutton.c +++ b/drivers/cbus/retu-pwrbutton.c @@ -30,6 +30,7 @@ #include #include #include +#include #include "retu.h" @@ -92,8 +93,8 @@ static int __init retubutton_init(void) if (!pwrbtn_dev) return -ENOMEM; - pwrbtn_dev->evbit[0] = BIT(EV_KEY); - pwrbtn_dev->keybit[LONG(KEY_POWER)] = BIT(KEY_POWER); + pwrbtn_dev->evbit[0] = BIT_MASK(EV_KEY); + pwrbtn_dev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER); pwrbtn_dev->name = "retu-pwrbutton"; input_register_device(pwrbtn_dev); diff --git a/drivers/video/omap/Kconfig b/drivers/video/omap/Kconfig index 9418047e684..0d3d351fdf1 100644 --- a/drivers/video/omap/Kconfig +++ b/drivers/video/omap/Kconfig @@ -1,6 +1,9 @@ config FB_OMAP tristate "OMAP frame buffer support (EXPERIMENTAL)" depends on FB + select FB_CFB_FILLRECT + select FB_CFB_COPYAREA + select FB_CFB_IMAGEBLIT help Frame buffer driver for OMAP based boards. diff --git a/net/ipv4/netfilter/ipt_IDLETIMER.c b/net/ipv4/netfilter/ipt_IDLETIMER.c index 8e032e829ba..6432192cdeb 100644 --- a/net/ipv4/netfilter/ipt_IDLETIMER.c +++ b/net/ipv4/netfilter/ipt_IDLETIMER.c @@ -74,7 +74,7 @@ static void utimer_work(struct work_struct *work) struct utimer_t *timer = container_of(work, struct utimer_t, work); struct net_device *netdev; - netdev = dev_get_by_name(timer->name); + netdev = dev_get_by_name(&init_net, timer->name); if (netdev != NULL) { sysfs_notify(&netdev->dev.kobj, NULL, @@ -182,11 +182,12 @@ static int utimer_notifier_call(struct notifier_block *this, unsigned long event, void *ptr) { struct net_device *dev = ptr; + int ret = NOTIFY_DONE; switch (event) { case NETDEV_UP: DEBUGP("NETDEV_UP: %s\n", dev->name); - device_create_file(&dev->dev, + ret = device_create_file(&dev->dev, &dev_attr_idletimer); break; case NETDEV_DOWN: @@ -196,7 +197,7 @@ static int utimer_notifier_call(struct notifier_block *this, break; } - return NOTIFY_DONE; + return ret; } static struct notifier_block utimer_notifier_block = { @@ -219,7 +220,7 @@ static void utimer_fini(void) rtnl_lock(); unregister_netdevice_notifier(&utimer_notifier_block); - for_each_netdev(dev) + for_each_netdev(&init_net, dev) utimer_notifier_call(&utimer_notifier_block, NETDEV_DOWN, dev); rtnl_unlock(); @@ -228,7 +229,7 @@ static void utimer_fini(void) /* * The actual iptables plugin. */ -static unsigned int ipt_idletimer_target(struct sk_buff **pskb, +static unsigned int ipt_idletimer_target(struct sk_buff *pskb, const struct net_device *in, const struct net_device *out, unsigned int hooknum, @@ -249,7 +250,7 @@ static unsigned int ipt_idletimer_target(struct sk_buff **pskb, return XT_CONTINUE; } -static int ipt_idletimer_checkentry(const char *tablename, +static bool ipt_idletimer_checkentry(const char *tablename, const void *e, const struct xt_target *target, void *targinfo, @@ -263,7 +264,7 @@ static int ipt_idletimer_checkentry(const char *tablename, return 0; } - return 1; + return true; } static struct xt_target ipt_idletimer = {