- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / drivers / staging / dream / pmem.c

diff --git a/drivers/staging/dream/pmem.c b/drivers/staging/dream/pmem.c
index 6edfdd4..6387365 100644 (file)
--- a/drivers/staging/dream/pmem.c
+++ b/drivers/staging/dream/pmem.c
@@ -38,17 +38,17 @@
  * the file should not be released until put_pmem_file is called */
 #define PMEM_FLAGS_BUSY 0x1
 /* indicates that this is a suballocation of a larger master range */
-#define PMEM_FLAGS_CONNECTED ( 0x1 << 1 )
+#define PMEM_FLAGS_CONNECTED (0x1 << 1)
 /* indicates this is a master and not a sub allocation and that it is mmaped */
-#define PMEM_FLAGS_MASTERMAP ( 0x1 << 2 )
+#define PMEM_FLAGS_MASTERMAP (0x1 << 2)
 /* submap and unsubmap flags indicate:
  * 00: subregion has never been mmaped
  * 10: subregion has been mmaped, reference to the mm was taken
  * 11: subretion has ben released, refernece to the mm still held
  * 01: subretion has been released, reference to the mm has been released
  */
-#define PMEM_FLAGS_SUBMAP ( 0x1 << 3 )
-#define PMEM_FLAGS_UNSUBMAP ( 0x1 << 4 )
+#define PMEM_FLAGS_SUBMAP (0x1 << 3)
+#define PMEM_FLAGS_UNSUBMAP (0x1 << 4)
 
 
 struct pmem_data {
@@ -153,7 +153,7 @@ struct pmem_info {
 static struct pmem_info pmem[PMEM_MAX_DEVICES];
 static int id_count;
 
-#define PMEM_IS_FREE(id, index) ( !(pmem[id].bitmap[index].allocated) )
+#define PMEM_IS_FREE(id, index) (!(pmem[id].bitmap[index].allocated))
 #define PMEM_ORDER(id, index) pmem[id].bitmap[index].order
 #define PMEM_BUDDY_INDEX(id, index) (index ^ (1 << PMEM_ORDER(id, index)))
 #define PMEM_NEXT_INDEX(id, index) (index + (1 << PMEM_ORDER(id, index)))
@@ -845,8 +845,8 @@ static int pmem_connect(unsigned long connect, struct file *file)
        src_data = (struct pmem_data *)src_file->private_data;
 
        if (has_allocation(file) && (data->index != src_data->index)) {
-               printk(KERN_INFO "pmem: file is already mapped but doesn't match this"
-                      " src_file!\n");
+               printk(KERN_INFO "pmem: file is already mapped but doesn't "
+                       "match this src_file!\n");
                ret = -EINVAL;
                goto err_bad_file;
        }
@@ -935,8 +935,8 @@ int pmem_remap(struct pmem_region *region, struct file *file,
        if (unlikely(!PMEM_IS_PAGE_ALIGNED(region->offset) ||
                 !PMEM_IS_PAGE_ALIGNED(region->len))) {
 #if PMEM_DEBUG
-               printk(KERN_DEBUG "pmem: request for unaligned pmem suballocation "
-                      "%lx %lx\n", region->offset, region->len);
+               printk(KERN_DEBUG "pmem: request for unaligned pmem "
+                       "suballocation %lx %lx\n", region->offset, region->len);
 #endif
                return -EINVAL;
        }
@@ -1086,8 +1086,8 @@ static long pmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
                                region.offset = pmem_start_addr(id, data);
                                region.len = pmem_len(id, data);
                        }
-                       printk(KERN_INFO "pmem: request for physical address of pmem region "
-                                       "from process %d.\n", current->pid);
+                       printk(KERN_INFO "pmem: request for physical address "
+                            "of pmem region from process %d.\n", current->pid);
                        if (copy_to_user((void __user *)arg, &region,
                                                sizeof(struct pmem_region)))
                                return -EFAULT;
@@ -1245,14 +1245,11 @@ int pmem_setup(struct android_pmem_platform_data *pdata,
        }
        pmem[id].num_entries = pmem[id].size / PMEM_MIN_ALLOC;
 
-       pmem[id].bitmap = kmalloc(pmem[id].num_entries *
+       pmem[id].bitmap = kcalloc(pmem[id].num_entries,
                                  sizeof(struct pmem_bits), GFP_KERNEL);
        if (!pmem[id].bitmap)
                goto err_no_mem_for_metadata;
 
-       memset(pmem[id].bitmap, 0, sizeof(struct pmem_bits) *
-                                         pmem[id].num_entries);
-
        for (i = sizeof(pmem[id].num_entries) * 8 - 1; i >= 0; i--) {
                if ((pmem[id].num_entries) &  1<<i) {
                        PMEM_ORDER(id, index) = i;