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

Jump to bottom

Mali-400 build and usage of SMP code in preemptible code fixes. #6

Merged
merged 2 commits into from
Jan 8, 2013
Merged

Mali-400 build and usage of SMP code in preemptible code fixes. #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c12e01
block: fix "BUG: using smp_processor_id() in preemptible code"
rzk Jan 6, 2013
ab10080
mali: fix build error.
rzk Jan 6, 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
6 changes: 4 additions & 2 deletions block/blk-core.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1273,8 +1273,10 @@ static int __make_request(struct request_queue *q, struct bio *bio)
init_request_from_bio(req, bio);

if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) ||
bio_flagged(bio, BIO_CPU_AFFINE))
req->cpu = smp_processor_id();
bio_flagged(bio, BIO_CPU_AFFINE)) {
req->cpu = get_cpu();
put_cpu();
}

plug = current->plug;
if (plug) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/video/samsung/mali/linux/mali_kernel_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ int mali_driver_init(void)
}

/* print build options */
MALI_DEBUG_PRINT(2, ("%s\n", __malidrv_build_info()));
/* MALI_DEBUG_PRINT(2, ("%s\n", __malidrv_build_info())); */

return 0;
}
Expand Down