]> rtime.felk.cvut.cz Git - jailhouse.git/commitdiff
driver: use min macro from Linux instead of defining another one
authorHenning Schild <henning.schild@siemens.com>
Tue, 27 Jan 2015 14:05:27 +0000 (15:05 +0100)
committerJan Kiszka <jan.kiszka@siemens.com>
Sun, 1 Feb 2015 11:47:10 +0000 (12:47 +0100)
Signed-off-by: Henning Schild <henning.schild@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
driver.c

index 3e90d792255285f3826f6f8beb1a4dbcd6cc9dbd..2cc7d62e9a51c09756404322f830ec1ffe2c097f 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -125,8 +125,6 @@ static LIST_HEAD(cells);
 static struct cell *root_cell;
 static struct kobject *cells_dir;
 
-#define MIN(a, b)      ((a) < (b) ? (a) : (b))
-
 #ifdef CONFIG_X86
 bool jailhouse_use_vmcall;
 
@@ -374,7 +372,7 @@ static struct cell *create_cell(const struct jailhouse_cell_desc *cell_desc)
 
        bitmap_copy(cpumask_bits(&cell->cpus_assigned),
                    jailhouse_cell_cpu_set(cell_desc),
-                   MIN(nr_cpumask_bits, cell_desc->cpu_set_size * 8));
+                   min(nr_cpumask_bits, (int)cell_desc->cpu_set_size * 8));
 
        cell->num_memory_regions = cell_desc->num_memory_regions;
        cell->memory_regions = vmalloc(sizeof(struct jailhouse_memory) *