Changeset 53ad43c in mainline for kernel/generic/include


Ignore:
Timestamp:
2018-03-08T18:54:30Z (7 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5ef16903
Parents:
e0a4686
Message:

Replace ASM macro with the standard ASSEMBLER.

At least, GCC claims it to be a standard predefined macro. I was unable
to find the relevant standard, but it's defined in both gcc and clang.

Location:
kernel/generic/include
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/config.h

    re0a4686 r53ad43c  
    5050#define CONFIG_TASK_ARGUMENTS_BUFLEN 64
    5151
    52 #ifndef __ASM__
     52#ifndef __ASSEMBLER__
    5353
    5454#include <stdbool.h>
    … …  
    109109extern ballocs_t ballocs;
    110110
    111 #endif /* __ASM__ */
     111#endif /* __ASSEMBLER__ */
    112112
    113113#endif

  • kernel/generic/include/macros.h

    re0a4686 r53ad43c  
    3636#define KERN_MACROS_H_
    3737
    38 #ifndef __ASM__
     38#ifndef __ASSEMBLER__
    3939
    4040#include <stdint.h>
    … …  
    9898}
    9999
    100 #endif /* __ASM__ */
     100#endif /* __ASSEMBLER__ */
    101101
    102102#define ispwr2(x)  (((x) & ((x) - 1)) == 0)

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

    re0a4686 r53ad43c  
    4141#define KERN_ASID_H_
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <arch/mm/asid.h>
    … …  
    5555#define ASID_MAX        ASID_MAX_ARCH
    5656
    57 #ifndef __ASM__
     57#ifndef __ASSEMBLER__
    5858
    5959#define ASIDS_ALLOCABLE ((ASID_MAX + 1) - ASID_START)
Note: See TracChangeset for help on using the changeset viewer.