Merge pull request #5 from zehome/odroid-ed-3.0.y

hardkernel · hardkernel · commit d0d77e634892 · 2013-01-07T17:26:15.000-08:00
Merge from zehome/odroid-ed-3.0.y
diff --git 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);
diff --git 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);
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
@@ -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]={

Original file line number	Diff line number	Diff line change
`@@ -154,11 +154,10 @@ _mali_osk_errcode_t _mali_osk_pmm_dev_idle(void)`
`154`	`154`	`*/`
`155`	`155`	`int _mali_osk_pmm_dev_activate(void)`
`156`	`156`	`{`
`157`		`-`
	`157`	`+ int err = 0;`
`158`	`158`	`#if MALI_LICENSE_IS_GPL`
`159`	`159`	`#ifdef CONFIG_PM_RUNTIME`
`160`	`160`	`#if MALI_PMM_RUNTIME_JOB_CONTROL_ON`
`161`		`- int err = 0;`
`162`	`161`	`if(is_runtime == 0)`
`163`	`162`	`{`
`164`	`163`	`pm_suspend_ignore_children(&(mali_gpu_device.dev), true);`
-Original file line number
+Diff line change
 #endif
 #endif
 #endif
 -#endif
 -#endif
 -#endif
 };
 mali_dvfs_staycount_table mali_dvfs_staycount[MALI_DVFS_STEPS]={