Merge pull request #107 from Pyxisha/activate

after Irqbalance@dcc411e, the activate_mapping function seems a little redundancy, 
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
This commit is contained in:
Neil Horman 2019-07-15 07:09:18 -04:00 committed by GitHub
commit 2943002f1f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -60,8 +60,6 @@ static void activate_mapping(struct irq_info *info, void *data __attribute__((un
{ {
char buf[PATH_MAX]; char buf[PATH_MAX];
FILE *file; FILE *file;
cpumask_t applied_mask;
int valid_mask = 0;
/* /*
* only activate mappings for irqs that have moved * only activate mappings for irqs that have moved
@ -69,18 +67,13 @@ static void activate_mapping(struct irq_info *info, void *data __attribute__((un
if (!info->moved) if (!info->moved)
return; return;
if (info->assigned_obj) { if (!info->assigned_obj)
applied_mask = info->assigned_obj->mask; return;
valid_mask = 1;
}
/* /*
* Don't activate anything for which we have an invalid mask * Don't activate anything for which we have an invalid mask
*/ */
if (!valid_mask || check_affinity(info, applied_mask)) if (check_affinity(info, info->assigned_obj->mask))
return;
if (!info->assigned_obj)
return; return;
sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq); sprintf(buf, "/proc/irq/%i/smp_affinity", info->irq);
@ -88,7 +81,7 @@ static void activate_mapping(struct irq_info *info, void *data __attribute__((un
if (!file) if (!file)
return; return;
cpumask_scnprintf(buf, PATH_MAX, applied_mask); cpumask_scnprintf(buf, PATH_MAX, info->assigned_obj->mask);
fprintf(file, "%s", buf); fprintf(file, "%s", buf);
fclose(file); fclose(file);
info->moved = 0; /*migration is done*/ info->moved = 0; /*migration is done*/