Changeset 4c14b88 in mainline for kernel


Ignore:
Timestamp:
2013-12-31T07:57:14Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1b973dc
Parents:
6297465 (diff), 208b5f5 (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:

mainline changes

Location:
kernel
Files:
59 added
9 edited
5 moved

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    r6297465 r4c14b88  
    167167
    168168ifeq ($(COMPILER),gcc_cross)
     169        CFLAGS = $(GCC_CFLAGS)
     170        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
     171        INSTRUMENTATION = -finstrument-functions
     172endif
     173
     174ifeq ($(COMPILER),gcc_helenos)
    169175        CFLAGS = $(GCC_CFLAGS)
    170176        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)

  • kernel/arch/arm32/include/arch/mm/page_armv4.h

    r6297465 r4c14b88  
    4848        (((pte_t *) (pte))->l0.descriptor_type != 0)
    4949#define PTE_GET_FRAME_ARCH(pte) \
    50         (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH)
     50        (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
    5151#define PTE_WRITABLE_ARCH(pte) \
    5252        (((pte_t *) (pte))->l1.access_permission_0 == PTE_AP_USER_RW_KERNEL_RW)

  • kernel/arch/arm32/include/arch/mm/page_armv6.h

    r6297465 r4c14b88  
    4848        (((pte_t *) (pte))->l0.descriptor_type != 0)
    4949#define PTE_GET_FRAME_ARCH(pte) \
    50         (((pte_t *) (pte))->l1.frame_base_addr << FRAME_WIDTH)
     50        (((uintptr_t) ((pte_t *) (pte))->l1.frame_base_addr) << FRAME_WIDTH)
    5151#define PTE_WRITABLE_ARCH(pte) \
    5252        (((pte_t *) (pte))->l1.access_permission_1 != PTE_AP1_RO)

  • kernel/arch/arm32/src/mach/gta02/gta02.c

    r6297465 r4c14b88  
    4141#include <genarch/fb/fb.h>
    4242#include <abi/fb/visuals.h>
    43 #include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
    44 #include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
    45 #include <genarch/drivers/s3c24xx_timer/s3c24xx_timer.h>
     43#include <genarch/drivers/s3c24xx/uart.h>
     44#include <genarch/drivers/s3c24xx/irqc.h>
     45#include <genarch/drivers/s3c24xx/timer.h>
    4646#include <genarch/srln/srln.h>
    4747#include <sysinfo/sysinfo.h>

  • kernel/genarch/Makefile.inc

    r6297465 r4c14b88  
    9797ifeq ($(CONFIG_S3C24XX_IRQC),y)
    9898        GENARCH_SOURCES += \
    99                 genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c
     99                genarch/src/drivers/s3c24xx/irqc.c
    100100endif
    101101
    102102ifeq ($(CONFIG_S3C24XX_UART),y)
    103103        GENARCH_SOURCES += \
    104                 genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c
     104                genarch/src/drivers/s3c24xx/uart.c
    105105endif
    106106
    … …  
    108108        GENARCH_SOURCES += \
    109109                genarch/src/drivers/omap/uart.c
     110endif
     111
     112ifeq ($(CONFIG_GRLIB_UART),y)
     113        GENARCH_SOURCES += \
     114                genarch/src/drivers/grlib/uart.c
     115endif
     116
     117ifeq ($(CONFIG_GRLIB_IRQMP),y)
     118        GENARCH_SOURCES += \
     119                genarch/src/drivers/grlib/irqmp.c
    110120endif
    111121

  • kernel/genarch/src/drivers/s3c24xx/irqc.c

    r6297465 r4c14b88  
    3737 */
    3838
    39 #include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
     39#include <genarch/drivers/s3c24xx/irqc.h>
    4040#include <arch/asm.h>
    4141

  • kernel/genarch/src/drivers/s3c24xx/uart.c

    r6297465 r4c14b88  
    3838 */
    3939
    40 #include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
     40#include <genarch/drivers/s3c24xx/uart.h>
    4141#include <console/chardev.h>
    4242#include <console/console.h>

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

    r6297465 r4c14b88  
    3737#define KERN_LIST_H_
    3838
     39#include <debug.h>
    3940#include <typedefs.h>
    4041#include <trace.h>
    … …  
    7374            _link != &(list).head; _link = _link->next)
    7475
     76#define list_foreach_rev(list, member, itype, iterator) \
     77        for (itype *iterator = NULL; iterator == NULL; iterator = (itype *) 1) \
     78            for (link_t *_link = (list).head.prev; \
     79            iterator = list_get_instance(_link, itype, member), \
     80            _link != &(list).head; _link = _link->prev)
     81
    7582#define assert_link_not_used(link) \
    76         ASSERT(((link)->prev == NULL) && ((link)->next == NULL))
     83        ASSERT(!link_used(link))
    7784
    7885/** Initialize doubly-linked circular list link
    … …  
    319326}
    320327
     328/** Determine if link is used.
     329 *
     330 * @param link Link
     331 * @return @c true if link is used, @c false if not.
     332 */
     333static inline bool link_used(link_t *link)
     334{
     335        if (link->prev == NULL && link->next == NULL)
     336                return false;
     337
     338        ASSERT(link->prev != NULL && link->next != NULL);
     339        return true;
     340}
     341
    321342extern int list_member(const link_t *, const list_t *);
    322343extern void list_concat(list_t *, list_t *);

  • kernel/generic/include/config.h

    r6297465 r4c14b88  
    4747#define CONFIG_TASK_NAME_BUFLEN  32
    4848#define CONFIG_TASK_ARGUMENTS_BUFLEN 64
    49 
    50 /**
    51  * Maximum buffer size allowed for IPC_M_DATA_WRITE and IPC_M_DATA_READ
    52  * requests.
    53  */
    54 #define DATA_XFER_LIMIT  (64 * 1024)
    5549
    5650#ifndef __ASM__

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

    r6297465 r4c14b88  
    1         /*
     1/*
    22 * Copyright (c) 2011 Martin Decky
    33 * All rights reserved.

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

    r6297465 r4c14b88  
    517517       
    518518#ifdef SCHEDULER_VERBOSE
    519         printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64 
    520             ", nrdy=%ld)\n", CPU->id, THREAD->tid, THREAD->priority,
     519        printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
     520            ", nrdy=%" PRIua ")\n", CPU->id, THREAD->tid, THREAD->priority,
    521521            THREAD->ticks, atomic_get(&CPU->nrdy));
    522522#endif
Note: See TracChangeset for help on using the changeset viewer.