Changeset 055a68a in mainline for kernel


Ignore:
Timestamp:
2015-04-23T23:47:40Z (11 years ago)
Author:
Michal Koutný <xm.koutny+hos@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a18a8b9
Parents:
acb8766e (diff), dcba819 (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 mainline changes

Location:
kernel
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • kernel/Makefile

    racb8766e r055a68a  
    105105CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
    106106        -ffreestanding -fno-builtin -nostdlib -nostdinc \
    107         -Wall -Werror -Wextra -Wno-unused-parameter -Wmissing-prototypes \
     107        -std=gnu99 -Wall -Werror -Wextra -Wno-unused-parameter -Wmissing-prototypes \
    108108        -Werror-implicit-function-declaration -Wwrite-strings \
    109         -integrated-as \
    110         -pipe -target $(CLANG_TARGET)
     109        -integrated-as -pipe -target $(CLANG_TARGET)
    111110
    112111ifeq ($(CONFIG_DEBUG),y)

  • kernel/arch/amd64/Makefile.inc

    racb8766e r055a68a  
    9191        arch/$(KARCH)/include/arch/istate_struct.ag \
    9292        arch/$(KARCH)/include/arch/context_struct.ag
    93 

  • kernel/arch/mips32/include/arch/drivers/msim.h

    racb8766e r055a68a  
    3939#define MSIM_VIDEORAM     0x90000000
    4040#define MSIM_KBD_ADDRESS  0x90000000
     41
    4142#define MSIM_KBD_IRQ      2
     43#define MSIM_DDISK_IRQ    6
    4244
    4345#endif

  • kernel/arch/mips32/src/mach/msim/msim.c

    racb8766e r055a68a  
    6262void msim_init(void)
    6363{
     64        cp0_unmask_int(MSIM_DDISK_IRQ);
    6465}
    6566

  • kernel/generic/include/typedefs.h

    racb8766e r055a68a  
    4747
    4848typedef struct {
    49         uint64_t lo;
    50         int64_t hi;
    51 } __attribute__ ((aligned(16))) int128_t;
    52 
    53 typedef struct {
    54         uint64_t lo;
    55         uint64_t hi;
    56 } __attribute__ ((aligned(16))) uint128_t;
    57 
    58 typedef struct {
    5949        volatile atomic_count_t count;
    6050} atomic_t;

  • kernel/generic/src/mm/frame.c

    racb8766e r055a68a  
    7373static size_t mem_avail_req = 0;  /**< Number of frames requested. */
    7474static size_t mem_avail_gen = 0;  /**< Generation counter. */
    75 
    76 /********************/
    77 /* Helper functions */
    78 /********************/
    79 
    80 NO_TRACE static inline size_t frame_index(zone_t *zone, frame_t *frame)
    81 {
    82         return (size_t) (frame - zone->frames);
    83 }
    84 
    85 NO_TRACE static inline size_t frame_index_abs(zone_t *zone, frame_t *frame)
    86 {
    87         return (size_t) (frame - zone->frames) + zone->base;
    88 }
    89 
    90 NO_TRACE static inline bool frame_index_valid(zone_t *zone, size_t index)
    91 {
    92         return (index < zone->count);
    93 }
    9475
    9576/** Initialize frame structure.

  • kernel/test/smpcall/smpcall1.c

    racb8766e r055a68a  
    11/*
    2  * Copyright (c) 2012 Adam Hraska 
     2 * Copyright (c) 2012 Adam Hraska
    33 * All rights reserved.
    44 *

  • kernel/test/synch/rcu1.c

    racb8766e r055a68a  
    698698                return true;
    699699        } else {
    700                 TPRINTF(err);
     700                TPRINTF("%s", err);
    701701                /* Leak a bit of mem. */
    702702                return false;

  • kernel/test/synch/workqueue2.c

    racb8766e r055a68a  
    129129        res = test_custom_workq();
    130130        if (res) {
    131                 TPRINTF(res);
     131                TPRINTF("%s", res);
    132132                err = res;
    133133        }
    … …  
    135135        res = test_custom_workq_stop();
    136136        if (res) {
    137                 TPRINTF(res);
     137                TPRINTF("%s", res);
    138138                err = res;
    139139        }
    … …  
    141141        res = test_workqueue3();
    142142        if (res) {
    143                 TPRINTF(res);
     143                TPRINTF("%s", res);
    144144                err = res;
    145145        }
Note: See TracChangeset for help on using the changeset viewer.