Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Odroid ed 3.0.y #5

Merged
merged 3 commits into from
Jan 8, 2013
Merged

Odroid ed 3.0.y #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd641d5
Fix wrong number of endif. (Bad merge?)
zehome Jan 7, 2013
19934b5
Fix compilation error when no power management is configured in the k…
zehome Jan 7, 2013
fd23a74
Fix bad merge
zehome Jan 7, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions block/cfq-iosched.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/video/samsung/mali/linux/mali_osk_pm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions drivers/media/video/samsung/mali/platform/pegasus-m400/mali_platform_dvfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]={
Expand Down