Changes in / [72bf0d2:f8f7dba] in mainline


Ignore:
Files:
4 added
14 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/abs32le/Makefile.inc

    r72bf0d2 rf8f7dba  
    5050endif
    5151
    52 ifeq ($(COMPILER),clang)
    53         CLANG_ARCH = i386
    54 endif
    55 
    5652BITS = 32
    5753ENDIANESS = LE

  • kernel/arch/sparc64/include/mm/sun4v/mmu.h

    r72bf0d2 rf8f7dba  
    2828 */
    2929
    30 /** @addtogroup sparc64mm
     30/** @addtogroup sparc64mm       
    3131 * @{
    3232 */

  • kernel/arch/sparc64/include/mm/sun4v/tlb.h

    r72bf0d2 rf8f7dba  
    2828 */
    2929
    30 /** @addtogroup sparc64mm
     30/** @addtogroup sparc64mm       
    3131 * @{
    3232 */

  • kernel/arch/sparc64/include/mm/sun4v/tsb.h

    r72bf0d2 rf8f7dba  
    2828 */
    2929
    30 /** @addtogroup sparc64mm
     30/** @addtogroup sparc64mm       
    3131 * @{
    3232 */

  • kernel/arch/sparc64/include/mm/sun4v/tte.h

    r72bf0d2 rf8f7dba  
    2727 */
    2828
    29 /** @addtogroup sparc64mm
     29/** @addtogroup sparc64mm       
    3030 * @{
    3131 */

  • kernel/arch/sparc64/include/smp/sun4v/smp.h

    r72bf0d2 rf8f7dba  
    3838#define KERN_sparc64_sun4v_SMP_H_
    3939
    40 #include <typedefs.h>
    41 #include <arch/sun4v/cpu.h>
    42 
    43 extern bool calculate_optimal_nrdy(exec_unit_t *);
     40bool calculate_optimal_nrdy(exec_unit_t *exec_unit);
    4441
    4542#endif

  • kernel/arch/sparc64/include/sun4v/cpu.h

    r72bf0d2 rf8f7dba  
    4444#ifndef __ASM__
    4545
    46 #include <atomic.h>
    47 #include <synch/spinlock.h>
    48 
    4946struct cpu;
    5047
    … …  
    5451        uint64_t cpuids[MAX_CORE_STRANDS];
    5552        struct cpu *cpus[MAX_CORE_STRANDS];
     53        //cpu_t *cpus[MAX_CORE_STRANDS];
    5654        atomic_t nrdy;
    5755        SPINLOCK_DECLARE(proposed_nrdy_lock);

  • kernel/arch/sparc64/include/sun4v/ipi.h

    r72bf0d2 rf8f7dba  
    3838#define KERN_sparc64_sun4v_IPI_H_
    3939
    40 #include <arch/types.h>
    41 
    42 extern uint64_t ipi_brodcast_to(void (*)(void), uint16_t cpu_list[], uint64_t);
    43 extern uint64_t ipi_unicast_to(void (*)(void), uint16_t);
     40uint64_t ipi_brodcast_to(void (*func)(void), uint16_t cpu_list[MAX_NUM_STRANDS],
     41                uint64_t list_size);
     42uint64_t ipi_unicast_to(void (*func)(void), uint16_t cpu_id);
    4443
    4544#endif

  • kernel/arch/sparc64/include/trap/sun4v/interrupt.h

    r72bf0d2 rf8f7dba  
    4040#ifndef __ASM__
    4141
    42 extern void sun4v_ipi_init(void);
    43 extern void cpu_mondo(void);
     42void sun4v_ipi_init(void);
     43void cpu_mondo(void);
    4444
    4545#endif

  • kernel/arch/sparc64/src/cpu/sun4v/cpu.c

    r72bf0d2 rf8f7dba  
    4242#include <arch/sun4v/hypercall.h>
    4343#include <arch/trap/sun4v/interrupt.h>
     44
     45//#include <arch/trap/sun4v/interrupt.h>
    4446
    4547/** Perform sparc64 specific initialization of the processor structure for the
    … …  
    9597{
    9698        printf("cpu%d: Niagara (%d MHz)\n", m->id,
    97             m->arch.clock_frequency / 1000000);
     99                m->arch.clock_frequency / 1000000);
    98100}
    99101

  • kernel/arch/sparc64/src/smp/sun4u/smp.c

    r72bf0d2 rf8f7dba  
    3636#include <genarch/ofw/ofw_tree.h>
    3737#include <cpu.h>
    38 #include <arch/cpu_family.h>
     38#include <arch/sun4u/cpu_family.h>
    3939#include <arch/cpu.h>
    4040#include <arch.h>
    … …  
    4545#include <synch/waitq.h>
    4646#include <print.h>
    47 #include <arch/cpu_node.h>
     47#include <arch/sun4u/cpu_node.h>
    4848
    4949/**
    … …  
    6262{
    6363        ofw_tree_node_t *node;
    64         unsigned int cnt = 0;
     64        count_t cnt = 0;
    6565       
    6666        if (is_us() || is_us_iii()) {

  • kernel/arch/sparc64/src/trap/sun4v/interrupt.c

    r72bf0d2 rf8f7dba  
    3636#include <arch/trap/interrupt.h>
    3737#include <arch/sparc64.h>
     38#include <arch/trap/interrupt.h>
    3839#include <interrupt.h>
    3940#include <ddi/irq.h>
    … …  
    8889                CPU_MONDO_NENTRIES) != EOK)
    8990                        panic("Initializing mondo queue failed on CPU %d.\n",
    90                             CPU->arch.id);
     91                        CPU->arch.id);
    9192}
    9293
    … …  
    9798void cpu_mondo(void)
    9899{
    99 #ifdef CONFIG_SMP
    100100        unsigned int tail = asi_u64_read(ASI_QUEUE, VA_CPU_MONDO_QUEUE_TAIL);
    101101        unsigned int head = asi_u64_read(ASI_QUEUE, VA_CPU_MONDO_QUEUE_HEAD);
    102102
    103103        while (head != tail) {
     104
    104105                uint64_t data1 = cpu_mondo_queues[CPU->id][0];
    105106
    106107                head = (head + CPU_MONDO_ENTRY_SIZE * sizeof(uint64_t)) %
    107                     (CPU_MONDO_QUEUE_SIZE * sizeof(uint64_t));
     108                        (CPU_MONDO_QUEUE_SIZE * sizeof(uint64_t));
    108109                asi_u64_write(ASI_QUEUE, VA_CPU_MONDO_QUEUE_HEAD, head);
    109110
    110                 if (data1 == (uintptr_t) tlb_shootdown_ipi_recv) {
     111                if (data1 == (uint64_t) tlb_shootdown_ipi_recv) {
    111112                        ((void (*)(void)) data1)();
    112113                } else {
    113114                        printf("Spurious interrupt on %d, data = %lx.\n",
    114                             CPU->arch.id, data1);
     115                                CPU->arch.id, data1);
    115116                }
     117
    116118        }
    117 #endif
     119
    118120}
    119121

  • kernel/generic/src/proc/scheduler.c

    r72bf0d2 rf8f7dba  
    201201                 * even though there is a runnable thread.
    202202                 */
    203 
    204203                 cpu_sleep();
    205204                 goto loop;

  • uspace/lib/libc/arch/abs32le/Makefile.inc

    r72bf0d2 rf8f7dba  
    4646endif
    4747
    48 ifeq ($(COMPILER),clang)
    49         CLANG_ARCH = i386
    50 endif
    51 
    5248ARCH_SOURCES = \
    5349        arch/$(UARCH)/src/entry.c \
Note: See TracChangeset for help on using the changeset viewer.