From dd641d52d90d485afe85bc90b914c16ca8e405fa Mon Sep 17 00:00:00 2001 From: Laurent Coustet Date: Mon, 7 Jan 2013 23:27:22 +0100 Subject: [PATCH 1/3] Fix wrong number of endif. (Bad merge?) --- .../samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c b/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c index c74d7f03862381..b726216540f374 100755 --- a/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c +++ b/drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c @@ -82,9 +82,6 @@ mali_dvfs_step step[MALI_DVFS_STEPS]={ #endif #endif #endif -#endif -#endif -#endif }; mali_dvfs_staycount_table mali_dvfs_staycount[MALI_DVFS_STEPS]={ From 19934b5441b7d0ff5e2c80a600d95242c137ac76 Mon Sep 17 00:00:00 2001 From: Laurent Coustet Date: Mon, 7 Jan 2013 23:27:48 +0100 Subject: [PATCH 2/3] Fix compilation error when no power management is configured in the kernel --- drivers/media/video/samsung/mali/linux/mali_osk_pm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/video/samsung/mali/linux/mali_osk_pm.c b/drivers/media/video/samsung/mali/linux/mali_osk_pm.c index 9fce1813e113c9..b68390324cd785 100755 --- a/drivers/media/video/samsung/mali/linux/mali_osk_pm.c +++ b/drivers/media/video/samsung/mali/linux/mali_osk_pm.c @@ -154,11 +154,10 @@ _mali_osk_errcode_t _mali_osk_pmm_dev_idle(void) */ int _mali_osk_pmm_dev_activate(void) { - + int err = 0; #if MALI_LICENSE_IS_GPL #ifdef CONFIG_PM_RUNTIME #if MALI_PMM_RUNTIME_JOB_CONTROL_ON - int err = 0; if(is_runtime == 0) { pm_suspend_ignore_children(&(mali_gpu_device.dev), true); From fd23a740b27cec38fed96d7624b2f3aa4096d1d9 Mon Sep 17 00:00:00 2001 From: Laurent Coustet Date: Mon, 7 Jan 2013 23:28:09 +0100 Subject: [PATCH 3/3] Fix bad merge --- block/cfq-iosched.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 1142abad570284..8fa84ba2570034 100755 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -1502,16 +1502,11 @@ static void cfq_add_rq_rb(struct request *rq) { struct cfq_queue *cfqq = RQ_CFQQ(rq); struct cfq_data *cfqd = cfqq->cfqd; - struct request *__alias, *prev; + struct request *prev; cfqq->queued[rq_is_sync(rq)]++; - /* - * looks a little odd, but the first insert might return an alias. - * if that happens, put the alias on the dispatch list - */ - while ((__alias = elv_rb_add(&cfqq->sort_list, rq)) != NULL) - cfq_dispatch_insert(cfqd->queue, __alias); + elv_rb_add(&cfqq->sort_list, rq); if (!cfq_cfqq_on_rr(cfqq)) cfq_add_cfqq_rr(cfqd, cfqq);