From 4e6598183fb609823f6a377f576847b53e2125c2 Mon Sep 17 00:00:00 2001 From: Nanakos Chrysostomos Date: Thu, 27 May 2010 16:19:52 +0000 Subject: [PATCH] --- yaml --- r: 205651 b: refs/heads/master c: ef079a76fe78d713eb695a222601fccb3e706f0f h: refs/heads/master i: 205649: dd4e246dcf086df16b59dc8a952a789bae9e2a81 205647: 3429ac9893159251e2268a83f1ef84d26c3cc66d v: v3 --- [refs] | 2 +- trunk/drivers/staging/dream/pmem.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 5018b3e3869f..47199a6d22cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 231ded903f2f30b2bcdbf6672c7197187e3bb1ee +refs/heads/master: ef079a76fe78d713eb695a222601fccb3e706f0f diff --git a/trunk/drivers/staging/dream/pmem.c b/trunk/drivers/staging/dream/pmem.c index 6387365a833d..064b59e5b500 100644 --- a/trunk/drivers/staging/dream/pmem.c +++ b/trunk/drivers/staging/dream/pmem.c @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #define PMEM_MAX_DEVICES 10 @@ -175,7 +175,7 @@ static int pmem_mmap(struct file *, struct vm_area_struct *); static int pmem_open(struct inode *, struct file *); static long pmem_ioctl(struct file *, unsigned int, unsigned long); -struct file_operations pmem_fops = { +const struct file_operations pmem_fops = { .release = pmem_release, .mmap = pmem_mmap, .open = pmem_open, @@ -399,8 +399,8 @@ static int pmem_allocate(int id, unsigned long len) DLOG("order %lx\n", order); /* look through the bitmap: - * if you find a free slot of the correct order use it - * otherwise, use the best fit (smallest with size > order) slot + * if you find a free slot of the correct order use it + * otherwise, use the best fit (smallest with size > order) slot */ while (curr < end) { if (PMEM_IS_FREE(id, curr)) { @@ -426,8 +426,8 @@ static int pmem_allocate(int id, unsigned long len) } /* now partition the best fit: - * split the slot into 2 buddies of order - 1 - * repeat until the slot is of the correct order + * split the slot into 2 buddies of order - 1 + * repeat until the slot is of the correct order */ while (PMEM_ORDER(id, best_fit) > (unsigned char)order) { int buddy;