Changeset 8565a42 in mainline for kernel/generic/src/smp


Ignore:
Timestamp:
2018-03-02T20:34:50Z (8 years ago)
Author:
GitHub <noreply@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a1a81f69, d5e5fd1
Parents:
3061bc1 (diff), 34e1206 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
git-committer:
GitHub <noreply@…> (2018-03-02 20:34:50)
Message:

Remove all trailing whitespace, everywhere.

See individual commit messages for details.

Location:
kernel/generic/src/smp
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/src/smp/ipi.c

    r3061bc1 r8565a42  
    5555         * - if there is only one CPU but the kernel was compiled with CONFIG_SMP
    5656         */
    57        
     57
    5858        if (config.cpu_count > 1)
    5959                ipi_broadcast_arch(ipi);
  • kernel/generic/src/smp/smp.c

    r3061bc1 r8565a42  
    3434 * @file
    3535 */
    36  
     36
    3737#include <smp/smp.h>
    3838
  • kernel/generic/src/smp/smp_call.c

    r3061bc1 r8565a42  
    5555        assert(CPU);
    5656        assert(PREEMPTION_DISABLED || interrupts_disabled());
    57        
     57
    5858        spinlock_initialize(&CPU->smp_calls_lock, "cpu[].smp_calls_lock");
    5959        list_initialize(&CPU->smp_pending_calls);
     
    133133        assert(!interrupts_disabled());
    134134        assert(call_info != NULL);
    135        
     135
    136136        /* Discard invalid calls. */
    137137        if (config.cpu_count <= cpu_id || !cpus[cpu_id].active) {
     
    140140                return;
    141141        }
    142        
     142
    143143        /* Protect cpu->id against migration. */
    144144        preemption_disable();
    145145
    146146        call_start(call_info, func, arg);
    147        
     147
    148148        if (cpu_id != CPU->id) {
    149149#ifdef CONFIG_SMP
     
    169169                func(arg);
    170170                interrupts_restore(ipl);
    171                
     171
    172172                call_done(call_info);
    173173        }
    174        
     174
    175175        preemption_enable();
    176176}
     
    209209        assert(interrupts_disabled());
    210210        assert(CPU);
    211        
     211
    212212        list_t calls_list;
    213213        list_initialize(&calls_list);
    214        
     214
    215215        /*
    216216         * Acts as a load memory barrier. Any changes made by the cpu that
     
    224224        for (link_t *cur = calls_list.head.next, *next = cur->next;
    225225                !list_empty(&calls_list); cur = next, next = cur->next) {
    226                
     226
    227227                smp_call_t *call_info = list_get_instance(cur, smp_call_t, calls_link);
    228228                list_remove(cur);
    229                
     229
    230230                call_info->func(call_info->arg);
    231231                call_done(call_info);
     
    240240        call_info->func = func;
    241241        call_info->arg = arg;
    242        
     242
    243243        /*
    244244         * We can't use standard spinlocks here because we want to lock
     
    247247         */
    248248        atomic_set(&call_info->pending, 1);
    249        
     249
    250250        /* Let initialization complete before continuing. */
    251251        memory_barrier();
Note: See TracChangeset for help on using the changeset viewer.