Reduce data size a little. Reduce checkpatch noise. $ size kernel/softirq.o* text data bss dec hex filename 11554 6013 4008 21575 5447 kernel/softirq.o.new 11474 6093 4008 21575 5447 kernel/softirq.o.old
Showing the changes to kernel (1 of 2 files). Show all
Unified · Split
| @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp · 55 unmodified lines | ||
| 56 | 56 | |
| 57 | 57 | DEFINE_PER_CPU(struct task_struct *, ksoftirqd); |
| 58 | 58 | |
| 59 | −char *softirq_to_name[NR_SOFTIRQS] = { | |
| 59 | +const char * const softirq_to_name[NR_SOFTIRQS] = { | |
| 60 | 60 | "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL", |
| 61 | 61 | "TASKLET", "SCHED", "HRTIMER", "RCU" |
| 62 | 62 | }; |
| @@ -138,7 +138,6 @@ void _local_bh_enable(void) · 75 unmodified lines | ||
| 138 | 138 | WARN_ON_ONCE(in_irq()); |
| 139 | 139 | __local_bh_enable(SOFTIRQ_DISABLE_OFFSET); |
| 140 | 140 | } |
| 141 | − | |
| 142 | 141 | EXPORT_SYMBOL(_local_bh_enable); |
| 143 | 142 | |
| 144 | 143 | void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) |
| @@ -155,7 +154,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) · 10 unmodified lines | ||
| 155 | 154 | /* |
| 156 | 155 | * Keep preemption disabled until we are done with |
| 157 | 156 | * softirq processing: |
| 158 | − */ | |
| 157 | + */ | |
| 159 | 158 | preempt_count_sub(cnt - 1); |
| 160 | 159 | |
| 161 | 160 | if (unlikely(!in_interrupt() && local_softirq_pending())) { |
| @@ -436,8 +435,7 @@ void open_softirq(int nr, void (*action)(struct softirq_action *)) · 274 unmodified lines | ||
| 436 | 435 | /* |
| 437 | 436 | * Tasklets |
| 438 | 437 | */ |
| 439 | −struct tasklet_head | |
| 440 | −{ | |
| 438 | +struct tasklet_head { | |
| 441 | 439 | struct tasklet_struct *head; |
| 442 | 440 | struct tasklet_struct **tail; |
| 443 | 441 | }; |
| @@ -456,7 +454,6 @@ void __tasklet_schedule(struct tasklet_struct *t) · 12 unmodified lines | ||
| 456 | 454 | raise_softirq_irqoff(TASKLET_SOFTIRQ); |
| 457 | 455 | local_irq_restore(flags); |
| 458 | 456 | } |
| 459 | − | |
| 460 | 457 | EXPORT_SYMBOL(__tasklet_schedule); |
| 461 | 458 | |
| 462 | 459 | void __tasklet_hi_schedule(struct tasklet_struct *t) |
| @@ -470,7 +467,6 @@ void __tasklet_hi_schedule(struct tasklet_struct *t) · 7 unmodified lines | ||
| 470 | 467 | raise_softirq_irqoff(HI_SOFTIRQ); |
| 471 | 468 | local_irq_restore(flags); |
| 472 | 469 | } |
| 473 | − | |
| 474 | 470 | EXPORT_SYMBOL(__tasklet_hi_schedule); |
| 475 | 471 | |
| 476 | 472 | void __tasklet_hi_schedule_first(struct tasklet_struct *t) |
| @@ -481,7 +477,6 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t) · 4 unmodified lines | ||
| 481 | 477 | __this_cpu_write(tasklet_hi_vec.head, t); |
| 482 | 478 | __raise_softirq_irqoff(HI_SOFTIRQ); |
| 483 | 479 | } |
| 484 | − | |
| 485 | 480 | EXPORT_SYMBOL(__tasklet_hi_schedule_first); |
| 486 | 481 | |
| 487 | 482 | static void tasklet_action(struct softirq_action *a) |
| @@ -501,7 +496,8 @@ static void tasklet_action(struct softirq_action *a) · 13 unmodified lines | ||
| 501 | 496 | |
| 502 | 497 | if (tasklet_trylock(t)) { |
| 503 | 498 | if (!atomic_read(&t->count)) { |
| 504 | − if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state)) | |
| 499 | + if (!test_and_clear_bit(TASKLET_STATE_SCHED, | |
| 500 | + &t->state)) | |
| 505 | 501 | BUG(); |
| 506 | 502 | t->func(t->data); |
| 507 | 503 | tasklet_unlock(t); |
| @@ -536,7 +532,8 @@ static void tasklet_hi_action(struct softirq_action *a) · 28 unmodified lines | ||
| 536 | 532 | |
| 537 | 533 | if (tasklet_trylock(t)) { |
| 538 | 534 | if (!atomic_read(&t->count)) { |
| 539 | − if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state)) | |
| 535 | + if (!test_and_clear_bit(TASKLET_STATE_SCHED, | |
| 536 | + &t->state)) | |
| 540 | 537 | BUG(); |
| 541 | 538 | t->func(t->data); |
| 542 | 539 | tasklet_unlock(t); |
| @@ -554,7 +551,6 @@ static void tasklet_hi_action(struct softirq_action *a) · 11 unmodified lines | ||
| 554 | 551 | } |
| 555 | 552 | } |
| 556 | 553 | |
| 557 | − | |
| 558 | 554 | void tasklet_init(struct tasklet_struct *t, |
| 559 | 555 | void (*func)(unsigned long), unsigned long data) |
| 560 | 556 | { |
| @@ -564,7 +560,6 @@ void tasklet_init(struct tasklet_struct *t, · 3 unmodified lines | ||
| 564 | 560 | t->func = func; |
| 565 | 561 | t->data = data; |
| 566 | 562 | } |
| 567 | − | |
| 568 | 563 | EXPORT_SYMBOL(tasklet_init); |
| 569 | 564 | |
| 570 | 565 | void tasklet_kill(struct tasklet_struct *t) |
| @@ -580,7 +575,6 @@ void tasklet_kill(struct tasklet_struct *t) · 9 unmodified lines | ||
| 580 | 575 | tasklet_unlock_wait(t); |
| 581 | 576 | clear_bit(TASKLET_STATE_SCHED, &t->state); |
| 582 | 577 | } |
| 583 | − | |
| 584 | 578 | EXPORT_SYMBOL(tasklet_kill); |
| 585 | 579 | |
| 586 | 580 | /* |
| @@ -730,9 +724,8 @@ static void takeover_tasklets(unsigned int cpu) · 143 unmodified lines | ||
| 730 | 724 | } |
| 731 | 725 | #endif /* CONFIG_HOTPLUG_CPU */ |
| 732 | 726 | |
| 733 | −static int cpu_callback(struct notifier_block *nfb, | |
| 734 | − unsigned long action, | |
| 735 | − void *hcpu) | |
| 727 | +static int cpu_callback(struct notifier_block *nfb, unsigned long action, | |
| 728 | + void *hcpu) | |
| 736 | 729 | { |
| 737 | 730 | switch (action) { |
| 738 | 731 | #ifdef CONFIG_HOTPLUG_CPU |