Changeset 2b3dd78 in mainline for kernel


Ignore:
Timestamp:
2018-01-31T12:02:00Z (8 years ago)
Author:
Jenda <jenda.jzqk73@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5595841
Parents:
a0a9cc2 (diff), 14d789c (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.
Message:

Merge remote-tracking branch 'upstream/master' into forwardport

change tmon includes because of new stdlib

Location:
kernel
Files:
60 edited
2 moved

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    ra0a9cc2 r2b3dd78  
    9090
    9191COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    92         -ffreestanding -fno-builtin -nostdlib -nostdinc \
     92        -ffreestanding -nostdlib -nostdinc \
    9393        -fexec-charset=UTF-8 -finput-charset=UTF-8 -fno-common \
    9494        -fdebug-prefix-map=$(realpath $(ROOT_PATH))=.
    … …  
    208208        generic/src/mm/backend_user.c \
    209209        generic/src/mm/slab.c \
    210         generic/src/lib/func.c \
     210        generic/src/lib/halt.c \
    211211        generic/src/lib/mem.c \
    212212        generic/src/lib/memfnc.c \

  • kernel/arch/abs32le/src/abs32le.c

    ra0a9cc2 r2b3dd78  
    3838#include <arch/asm.h>
    3939
    40 #include <func.h>
     40#include <halt.h>
    4141#include <config.h>
    4242#include <console/console.h>

  • kernel/arch/abs32le/src/mm/page.c

    ra0a9cc2 r2b3dd78  
    4141#include <align.h>
    4242#include <config.h>
    43 #include <func.h>
     43#include <halt.h>
    4444#include <arch/interrupt.h>
    4545#include <arch/asm.h>

  • kernel/arch/amd64/Makefile.inc

    ra0a9cc2 r2b3dd78  
    3232
    3333FPU_NO_CFLAGS = -mno-sse -mno-sse2
    34 COMMON_CFLAGS += -m64 -mcmodel=$(MEMORY_MODEL) -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer
     34COMMON_CFLAGS += -mcmodel=$(MEMORY_MODEL) -mno-red-zone -fno-unwind-tables -fno-omit-frame-pointer
    3535
    3636BITS = 64

  • kernel/arch/amd64/include/arch/interrupt.h

    ra0a9cc2 r2b3dd78  
    8383#define VECTOR_SMP_CALL_IPI       (IVT_FREEBASE + 3)
    8484
    85 extern void (* disable_irqs_function)(uint16_t);
    86 extern void (* enable_irqs_function)(uint16_t);
    87 extern void (* eoi_function)(void);
     85extern void (*disable_irqs_function)(uint16_t);
     86extern void (*enable_irqs_function)(uint16_t);
     87extern void (*eoi_function)(void);
    8888extern const char *irqs_info;
    8989

  • kernel/arch/amd64/src/interrupt.c

    ra0a9cc2 r2b3dd78  
    3939#include <panic.h>
    4040#include <arch/drivers/i8259.h>
    41 #include <func.h>
     41#include <halt.h>
    4242#include <cpu.h>
    4343#include <arch/asm.h>

  • kernel/arch/arm32/include/arch/elf.h

    ra0a9cc2 r2b3dd78  
    4040
    4141#ifdef __BE__
    42         #define ELF_DATA_ENCODING  ELFDATA2MSB
     42#define ELF_DATA_ENCODING  ELFDATA2MSB
    4343#else
    44         #define ELF_DATA_ENCODING  ELFDATA2LSB
     44#define ELF_DATA_ENCODING  ELFDATA2LSB
    4545#endif
    4646

  • kernel/arch/arm32/include/arch/exception.h

    ra0a9cc2 r2b3dd78  
    4545
    4646#ifdef HIGH_EXCEPTION_VECTORS
    47         #define EXC_BASE_ADDRESS  0xffff0000
     47#define EXC_BASE_ADDRESS  0xffff0000
    4848#else
    49         #define EXC_BASE_ADDRESS  0x0
     49#define EXC_BASE_ADDRESS  0x0
    5050#endif
    5151

  • kernel/arch/arm32/include/arch/mach/integratorcp/integratorcp.h

    ra0a9cc2 r2b3dd78  
    7777
    7878typedef struct {
    79         uintptr_t uart;
    80         uintptr_t kbd_ctrl;
    81         uintptr_t kbd_stat;
    82         uintptr_t kbd_data;
    83         uintptr_t kbd_intstat;
    84         uintptr_t rtc;
    85         uintptr_t rtc1_load;
    86         uintptr_t rtc1_read;
    87         uintptr_t rtc1_ctl;
    88         uintptr_t rtc1_intrclr;
    89         uintptr_t rtc1_intrstat;
    90         uintptr_t rtc1_bgload;
    91         uintptr_t irqc;
    92         uintptr_t irqc_mask;
    93         uintptr_t irqc_unmask;
    94         uintptr_t vga;
    95         uintptr_t cmcr;
    96         uintptr_t sdramcr;
     79        uintptr_t uart;
     80        uintptr_t kbd_ctrl;
     81        uintptr_t kbd_stat;
     82        uintptr_t kbd_data;
     83        uintptr_t kbd_intstat;
     84        uintptr_t rtc;
     85        uintptr_t rtc1_load;
     86        uintptr_t rtc1_read;
     87        uintptr_t rtc1_ctl;
     88        uintptr_t rtc1_intrclr;
     89        uintptr_t rtc1_intrstat;
     90        uintptr_t rtc1_bgload;
     91        uintptr_t irqc;
     92        uintptr_t irqc_mask;
     93        uintptr_t irqc_unmask;
     94        uintptr_t vga;
     95        uintptr_t cmcr;
     96        uintptr_t sdramcr;
    9797} icp_hw_map_t;
    9898

  • kernel/arch/arm32/include/arch/machine_func.h

    ra0a9cc2 r2b3dd78  
    108108extern size_t machine_get_irq_count(void);
    109109
    110 extern const char * machine_get_platform_name(void);
     110extern const char *machine_get_platform_name(void);
    111111
    112112#endif

  • kernel/arch/arm32/include/arch/types.h

    ra0a9cc2 r2b3dd78  
    3838
    3939#ifndef DOXYGEN
    40         #define ATTRIBUTE_PACKED __attribute__((packed))
     40#define ATTRIBUTE_PACKED __attribute__((packed))
    4141#else
    42         #define ATTRIBUTE_PACKED
     42#define ATTRIBUTE_PACKED
    4343#endif
    4444

  • kernel/arch/ia32/Makefile.inc

    ra0a9cc2 r2b3dd78  
    3434ENDIANESS = LE
    3535
    36 COMMON_CFLAGS += -m32 -fno-omit-frame-pointer
     36COMMON_CFLAGS += -fno-omit-frame-pointer
    3737
    3838## Accepted CPUs

  • kernel/arch/ia32/include/arch/interrupt.h

    ra0a9cc2 r2b3dd78  
    8585#define VECTOR_SMP_CALL_IPI       (IVT_FREEBASE + 3)
    8686
    87 extern void (* disable_irqs_function)(uint16_t);
    88 extern void (* enable_irqs_function)(uint16_t);
    89 extern void (* eoi_function)(void);
     87extern void (*disable_irqs_function)(uint16_t);
     88extern void (*enable_irqs_function)(uint16_t);
     89extern void (*eoi_function)(void);
    9090extern const char *irqs_info;
    9191

  • kernel/arch/ia32/include/arch/smp/smp.h

    ra0a9cc2 r2b3dd78  
    4242struct smp_config_operations {
    4343        /** Check whether a processor is enabled. */
    44         bool (* cpu_enabled)(size_t);
     44        bool (*cpu_enabled)(size_t);
    4545       
    4646        /** Check whether a processor is BSP. */

  • kernel/arch/ia32/src/interrupt.c

    ra0a9cc2 r2b3dd78  
    4040#include <panic.h>
    4141#include <arch/drivers/i8259.h>
    42 #include <func.h>
     42#include <halt.h>
    4343#include <cpu.h>
    4444#include <arch/asm.h>

  • kernel/arch/ia32/src/mm/page.c

    ra0a9cc2 r2b3dd78  
    4242#include <align.h>
    4343#include <config.h>
    44 #include <func.h>
     44#include <halt.h>
    4545#include <arch/interrupt.h>
    4646#include <arch/asm.h>

  • kernel/arch/ia32/src/smp/mps.c

    ra0a9cc2 r2b3dd78  
    4141#include <arch/smp/smp.h>
    4242#include <assert.h>
    43 #include <func.h>
     43#include <halt.h>
    4444#include <typedefs.h>
    4545#include <cpu.h>

  • kernel/arch/ia32/src/smp/smp.c

    ra0a9cc2 r2b3dd78  
    4545#include <synch/waitq.h>
    4646#include <arch/pm.h>
    47 #include <func.h>
     47#include <halt.h>
    4848#include <panic.h>
    4949#include <arch/asm.h>

  • kernel/arch/mips32/include/arch/elf.h

    ra0a9cc2 r2b3dd78  
    3939
    4040#ifdef __BE__
    41         #define ELF_DATA_ENCODING  ELFDATA2MSB
     41#define ELF_DATA_ENCODING  ELFDATA2MSB
    4242#else
    43         #define ELF_DATA_ENCODING  ELFDATA2LSB
     43#define ELF_DATA_ENCODING  ELFDATA2LSB
    4444#endif
    4545

  • kernel/arch/mips32/src/debugger.c

    ra0a9cc2 r2b3dd78  
    4242#include <arch.h>
    4343#include <arch/cp0.h>
    44 #include <func.h>
     44#include <halt.h>
    4545#include <symtab.h>
    4646

  • kernel/arch/mips32/src/exception.c

    ra0a9cc2 r2b3dd78  
    4343#include <print.h>
    4444#include <interrupt.h>
    45 #include <func.h>
     45#include <halt.h>
    4646#include <ddi/irq.h>
    4747#include <arch/debugger.h>

  • kernel/arch/riscv64/src/mm/page.c

    ra0a9cc2 r2b3dd78  
    4242#include <align.h>
    4343#include <config.h>
    44 #include <func.h>
     44#include <halt.h>
    4545#include <arch/interrupt.h>
    4646#include <arch/asm.h>

  • kernel/arch/riscv64/src/riscv64.c

    ra0a9cc2 r2b3dd78  
    4040#include <arch/drivers/ucb.h>
    4141
    42 #include <func.h>
     42#include <halt.h>
    4343#include <config.h>
    4444#include <errno.h>

  • kernel/arch/sparc64/include/arch/drivers/pci.h

    ra0a9cc2 r2b3dd78  
    5252
    5353struct pci_operations {
    54         void (* enable_interrupt)(pci_t *, int);
    55         void (* clear_interrupt)(pci_t *, int);
     54        void (*enable_interrupt)(pci_t *, int);
     55        void (*clear_interrupt)(pci_t *, int);
    5656};
    5757

  • kernel/arch/sparc64/include/arch/mm/cache_spec.h

    ra0a9cc2 r2b3dd78  
    4747
    4848#if defined (US)
    49         #define DCACHE_SIZE  (16 * 1024)
     49#define DCACHE_SIZE  (16 * 1024)
    5050#elif defined (US3)
    51         #define DCACHE_SIZE  (64 * 1024)
     51#define DCACHE_SIZE  (64 * 1024)
    5252#endif
    5353

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

    ra0a9cc2 r2b3dd78  
    5454const char *md_get_node_name(md_node_t node);
    5555bool md_get_integer_property(md_node_t node, const char *key,
    56         uint64_t *result);
     56    uint64_t *result);
    5757bool md_get_string_property(md_node_t node, const char *key,
    58         const char **result);
     58    const char **result);
    5959bool md_next_node(md_node_t *node, const char *name);
    6060void md_init(void);

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

    ra0a9cc2 r2b3dd78  
    4343#include <config.h>
    4444#include <macros.h>
    45 #include <func.h>
     45#include <halt.h>
    4646#include <stdbool.h>
    4747#include <stddef.h>

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

    ra0a9cc2 r2b3dd78  
    3535#include <debug.h>
    3636#include <panic.h>
    37 #include <func.h>
     37#include <halt.h>
    3838#include <log.h>
    3939#include <str.h>

  • kernel/doc/doxygroups.h

    ra0a9cc2 r2b3dd78  
    117117         * @ingroup mm
    118118         * @endcond
    119          */     
     119         */
    120120       
    121121        /**
    … …  
    193193         * @ingroup ddi
    194194         * @endcond
    195          */     
     195         */
    196196
    197197        /**
    … …  
    257257         * @ingroup debug
    258258         * @endcond
    259          */     
     259         */
    260260
    261261        /**
    … …  
    321321         * @ingroup interrupt
    322322         * @endcond
    323          */     
     323         */
    324324
    325325        /**
    … …  
    389389         * @ingroup others
    390390         * @endcond
    391          */     
     391         */
    392392
    393393        /**

  • kernel/genarch/include/genarch/ofw/ofw_tree.h

    ra0a9cc2 r2b3dd78  
    6565
    6666/* Walker for visiting OpenFirmware device tree nodes. */
    67 typedef bool (* ofw_tree_walker_t)(ofw_tree_node_t *, void *);
     67typedef bool (*ofw_tree_walker_t)(ofw_tree_node_t *, void *);
    6868
    6969extern void ofw_tree_init(ofw_tree_node_t *);

  • kernel/genarch/src/ofw/upa.c

    ra0a9cc2 r2b3dd78  
    3838#include <genarch/ofw/ofw_tree.h>
    3939#include <genarch/ofw/upa.h>
    40 #include <func.h>
     40#include <halt.h>
    4141#include <panic.h>
    4242#include <macros.h>

  • kernel/generic/include/adt/bitmap.h

    ra0a9cc2 r2b3dd78  
    3838#include <stddef.h>
    3939#include <stdbool.h>
     40#include <stdint.h>
    4041
    4142#define BITMAP_ELEMENT   8

  • kernel/generic/include/adt/hash_table.h

    ra0a9cc2 r2b3dd78  
    8484        member_to_inst((item), type, member)
    8585
    86 extern bool hash_table_create(hash_table_t *, size_t, size_t, 
    87         hash_table_ops_t *);
     86extern bool hash_table_create(hash_table_t *, size_t, size_t,
     87    hash_table_ops_t *);
    8888extern void hash_table_destroy(hash_table_t *);
    8989
    … …  
    9898extern size_t hash_table_remove(hash_table_t *, void *);
    9999extern void hash_table_remove_item(hash_table_t *, ht_link_t *);
    100 extern void hash_table_apply(hash_table_t *, bool (*)(ht_link_t *, void *), 
    101         void *);
     100extern void hash_table_apply(hash_table_t *, bool (*)(ht_link_t *, void *),
     101    void *);
    102102
    103103

  • kernel/generic/include/align.h

    ra0a9cc2 r2b3dd78  
    5858 * @param s Address or size to be checked for alignment.
    5959 * @param a Size of alignment, must be a power of 2.
    60  */ 
     60 */
    6161#define IS_ALIGNED(s, a)        (ALIGN_UP((s), (a)) == (s))
    6262

  • kernel/generic/include/arch.h

    ra0a9cc2 r2b3dd78  
    8080
    8181typedef struct {
    82         void (* pre_mm_init)(void);
    83         void (* post_mm_init)(void);
    84         void (* post_cpu_init)(void);
    85         void (* pre_smp_init)(void);
    86         void (* post_smp_init)(void);
     82        void (*pre_mm_init)(void);
     83        void (*post_mm_init)(void);
     84        void (*post_cpu_init)(void);
     85        void (*pre_smp_init)(void);
     86        void (*post_smp_init)(void);
    8787} arch_ops_t;
    8888

  • kernel/generic/include/gsort.h

    ra0a9cc2 r2b3dd78  
    3939#include <stddef.h>
    4040
    41 typedef int (* sort_cmp_t)(void *, void *, void *);
     41typedef int (*sort_cmp_t)(void *, void *, void *);
    4242
    4343extern bool gsort(void *, size_t, size_t, sort_cmp_t, void *);

  • kernel/generic/include/halt.h

    ra0a9cc2 r2b3dd78  
    3333 */
    3434
    35 #ifndef KERN_FUNC_H_
    36 #define KERN_FUNC_H_
     35#ifndef KERN_HALT_H_
     36#define KERN_HALT_H_
    3737
    3838#include <atomic.h>

  • kernel/generic/include/interrupt.h

    ra0a9cc2 r2b3dd78  
    6161
    6262extern void fault_from_uspace(istate_t *, const char *, ...)
    63     PRINTF_ATTRIBUTE(2, 3);
     63    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    6464extern void fault_if_from_uspace(istate_t *, const char *, ...)
    65     PRINTF_ATTRIBUTE(2, 3);
     65    _HELENOS_PRINTF_ATTRIBUTE(2, 3);
    6666extern istate_t *istate_get(thread_t *);
    6767extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);

  • kernel/generic/include/ipc/sysipc_ops.h

    ra0a9cc2 r2b3dd78  
    9090         * Invoked on:          all calls
    9191         */
    92         errno_t (* request_preprocess)(call_t *, phone_t *);
     92        errno_t (*request_preprocess)(call_t *, phone_t *);
    9393
    9494        /**
    … …  
    101101         *                      _ipc_answer_free_call()
    102102         * Invoked on:          all forgotten calls
    103          */     
    104         errno_t (* request_forget)(call_t *);
     103         */
     104        errno_t (*request_forget)(call_t *);
    105105
    106106        /**
    … …  
    111111         * Races with:          request_forget()
    112112         * Invoked on:          all calls delivered to the callee
    113          */     
    114         int (* request_process)(call_t *, answerbox_t *);
     113         */
     114        int (*request_process)(call_t *, answerbox_t *);
    115115
    116116        /**
    … …  
    123123         * Invoked on:          all forgotten calls
    124124         */
    125         errno_t (* answer_cleanup)(call_t *, ipc_data_t *);
     125        errno_t (*answer_cleanup)(call_t *, ipc_data_t *);
    126126
    127127        /**
    … …  
    134134         * Invoked on:          all answered calls
    135135         */
    136         errno_t (* answer_preprocess)(call_t *, ipc_data_t *);
     136        errno_t (*answer_preprocess)(call_t *, ipc_data_t *);
    137137
    138138        /**
    … …  
    144144         * Invoked on:          all answered calls
    145145         */
    146         errno_t (* answer_process)(call_t *);
     146        errno_t (*answer_process)(call_t *);
    147147} sysipc_ops_t;
    148148

  • kernel/generic/include/log.h

    ra0a9cc2 r2b3dd78  
    4848extern int log_vprintf(const char *, va_list);
    4949extern int log_printf(const char *, ...)
    50     PRINTF_ATTRIBUTE(1, 2);
     50    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    5151extern int log(log_facility_t, log_level_t, const char *, ...)
    52     PRINTF_ATTRIBUTE(3, 4);
     52    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    5353
    5454extern sys_errno_t sys_klog(sysarg_t, void *buf, size_t size,

  • kernel/generic/include/mm/page.h

    ra0a9cc2 r2b3dd78  
    4646/** Operations to manipulate page mappings. */
    4747typedef struct {
    48         void (* mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
    49         void (* mapping_remove)(as_t *, uintptr_t);
    50         bool (* mapping_find)(as_t *, uintptr_t, bool, pte_t *);
    51         void (* mapping_update)(as_t *, uintptr_t, bool, pte_t *);
    52         void (* mapping_make_global)(uintptr_t, size_t);
     48        void (*mapping_insert)(as_t *, uintptr_t, uintptr_t, unsigned int);
     49        void (*mapping_remove)(as_t *, uintptr_t);
     50        bool (*mapping_find)(as_t *, uintptr_t, bool, pte_t *);
     51        void (*mapping_update)(as_t *, uintptr_t, bool, pte_t *);
     52        void (*mapping_make_global)(uintptr_t, size_t);
    5353} page_mapping_operations_t;
    5454

  • kernel/generic/include/panic.h

    ra0a9cc2 r2b3dd78  
    6666extern void panic_common(panic_category_t, struct istate *, int,
    6767    uintptr_t, const char *, ...) __attribute__ ((noreturn))
    68     PRINTF_ATTRIBUTE(5, 6);
     68    _HELENOS_PRINTF_ATTRIBUTE(5, 6);
    6969
    7070#endif

  • kernel/generic/include/print.h

    ra0a9cc2 r2b3dd78  
    4444extern int puts(const char *s);
    4545extern int printf(const char *fmt, ...)
    46     PRINTF_ATTRIBUTE(1, 2);
     46    _HELENOS_PRINTF_ATTRIBUTE(1, 2);
    4747extern int snprintf(char *str, size_t size, const char *fmt, ...)
    48     PRINTF_ATTRIBUTE(3, 4);
     48    _HELENOS_PRINTF_ATTRIBUTE(3, 4);
    4949
    5050extern int vprintf(const char *fmt, va_list ap);

  • kernel/generic/include/printf/verify.h

    ra0a9cc2 r2b3dd78  
    3636#define KERN_PRINTF_VERIFY_H_
    3737
    38 #ifndef NVERIFY_PRINTF
     38#ifndef _HELENOS_NVERIFY_PRINTF
    3939
    4040#ifdef __clang__
    41 #define PRINTF_ATTRIBUTE(start, end) \
     41#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    4242        __attribute__((format(__printf__, start, end)))
    4343#else
    44 #define PRINTF_ATTRIBUTE(start, end) \
     44#define _HELENOS_PRINTF_ATTRIBUTE(start, end) \
    4545        __attribute__((format(gnu_printf, start, end)))
    4646#endif
    4747
    4848
    49 #else /* NVERIFY_PRINTF */
     49#else /* _HELENOS_NVERIFY_PRINTF */
    5050
    51 #define PRINTF_ATTRIBUTE(start, end)
     51#define _HELENOS_PRINTF_ATTRIBUTE(start, end)
    5252
    53 #endif /* NVERIFY_PRINTF */
     53#endif /* _HELENOS_NVERIFY_PRINTF */
    5454
    5555#endif

  • kernel/generic/include/stacktrace.h

    ra0a9cc2 r2b3dd78  
    4949
    5050typedef struct {
    51         bool (* stack_trace_context_validate)(stack_trace_context_t *);
    52         bool (* frame_pointer_prev)(stack_trace_context_t *, uintptr_t *);
    53         bool (* return_address_get)(stack_trace_context_t *, uintptr_t *);
    54         bool (* symbol_resolve)(uintptr_t, const char **, uintptr_t *);
     51        bool (*stack_trace_context_validate)(stack_trace_context_t *);
     52        bool (*frame_pointer_prev)(stack_trace_context_t *, uintptr_t *);
     53        bool (*return_address_get)(stack_trace_context_t *, uintptr_t *);
     54        bool (*symbol_resolve)(uintptr_t, const char **, uintptr_t *);
    5555} stack_trace_ops_t;
    5656

  • kernel/generic/include/symtab.h

    ra0a9cc2 r2b3dd78  
    4040
    4141extern void symtab_print_search(const char *);
    42 extern const char* symtab_hints_enum(const char *, const char **, void **);
     42extern const char *symtab_hints_enum(const char *, const char **, void **);
    4343
    4444#endif

  • kernel/generic/include/synch/condvar.h

    ra0a9cc2 r2b3dd78  
    6565    int flags);
    6666extern errno_t _condvar_wait_timeout_spinlock_impl(condvar_t *cv, spinlock_t *lock,
    67         uint32_t usec, int flags);
     67    uint32_t usec, int flags);
    6868extern errno_t _condvar_wait_timeout_irq_spinlock(condvar_t *cv,
    69         irq_spinlock_t *irq_lock, uint32_t usec, int flags);
     69    irq_spinlock_t *irq_lock, uint32_t usec, int flags);
    7070
    7171

  • kernel/generic/include/synch/workqueue.h

    ra0a9cc2 r2b3dd78  
    6464extern bool workq_global_enqueue(work_t *, work_func_t);
    6565
    66 extern struct work_queue * workq_create(const char *);
     66extern struct work_queue *workq_create(const char *);
    6767extern void workq_destroy(struct work_queue *);
    6868extern bool workq_init(struct work_queue *, const char *);

  • kernel/generic/include/typedefs.h

    ra0a9cc2 r2b3dd78  
    4343} atomic_t;
    4444
    45 typedef void (* function)(void);
     45typedef void (*function)(void);
    4646
    4747typedef uint32_t container_id_t;

  • kernel/generic/src/console/chardev.c

    ra0a9cc2 r2b3dd78  
    3939#include <synch/spinlock.h>
    4040#include <print.h>
    41 #include <func.h>
     41#include <halt.h>
    4242#include <cpu.h>
    4343

  • kernel/generic/src/console/cmd.c

    ra0a9cc2 r2b3dd78  
    5252#include <arch.h>
    5353#include <config.h>
    54 #include <func.h>
     54#include <halt.h>
    5555#include <str.h>
    5656#include <macros.h>

  • kernel/generic/src/console/kconsole.c

    ra0a9cc2 r2b3dd78  
    5252#include <macros.h>
    5353#include <debug.h>
    54 #include <func.h>
     54#include <halt.h>
    5555#include <str.h>
    5656#include <sysinfo/sysinfo.h>

  • kernel/generic/src/debug/panic.c

    ra0a9cc2 r2b3dd78  
    3636#include <print.h>
    3737#include <stacktrace.h>
    38 #include <func.h>
     38#include <halt.h>
    3939#include <typedefs.h>
    4040#include <mm/as.h>

  • kernel/generic/src/lib/halt.c

    ra0a9cc2 r2b3dd78  
    3333/**
    3434 * @file
    35  * @brief Miscellaneous functions.
     35 * @brief Halt function.
    3636 */
    3737
    38 #include <func.h>
     38#include <halt.h>
    3939#include <log.h>
    4040#include <cpu.h>
    … …  
    4343#include <console/kconsole.h>
    4444
    45 atomic_t haltstate = {0}; /**< Halt flag */
    46 
     45/** Halt flag */
     46atomic_t haltstate = {0};
    4747
    4848/** Halt wrapper

  • kernel/generic/src/main/kinit.c

    ra0a9cc2 r2b3dd78  
    5151#include <proc/program.h>
    5252#include <panic.h>
    53 #include <func.h>
     53#include <halt.h>
    5454#include <cpu.h>
    5555#include <arch/asm.h>

  • kernel/generic/src/main/main.c

    ra0a9cc2 r2b3dd78  
    6767#include <align.h>
    6868#include <interrupt.h>
     69#include <str.h>
    6970#include <mm/frame.h>
    7071#include <mm/page.h>

  • kernel/generic/src/main/shutdown.c

    ra0a9cc2 r2b3dd78  
    3838#include <arch.h>
    3939#include <proc/task.h>
    40 #include <func.h>
     40#include <halt.h>
    4141#include <print.h>
    4242#include <log.h>

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

    ra0a9cc2 r2b3dd78  
    5858#include <context.h>
    5959#include <fpu_context.h>
    60 #include <func.h>
     60#include <halt.h>
    6161#include <arch.h>
    6262#include <adt/list.h>

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

    ra0a9cc2 r2b3dd78  
    5656#include <print.h>
    5757#include <errno.h>
    58 #include <func.h>
     58#include <halt.h>
    5959#include <str.h>
    6060#include <syscall/copy.h>

  • kernel/generic/src/time/clock.c

    ra0a9cc2 r2b3dd78  
    4646#include <synch/spinlock.h>
    4747#include <synch/waitq.h>
    48 #include <func.h>
     48#include <halt.h>
    4949#include <proc/scheduler.h>
    5050#include <cpu.h>

  • kernel/generic/src/time/timeout.c

    ra0a9cc2 r2b3dd78  
    4141#include <panic.h>
    4242#include <synch/spinlock.h>
    43 #include <func.h>
     43#include <halt.h>
    4444#include <cpu.h>
    4545#include <arch/asm.h>

  • kernel/test/print/print5.c

    ra0a9cc2 r2b3dd78  
    3737 *
    3838 */
    39 #define NVERIFY_PRINTF
     39#define _HELENOS_NVERIFY_PRINTF
    4040
    4141#include <print.h>
Note: See TracChangeset for help on using the changeset viewer.