Changeset 53ad43c in mainline for kernel/arch/arm32/include


Ignore:
Timestamp:
2018-03-08T18:54:30Z (8 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/arch/arm32/include/arch
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    re0a4686 r53ad43c  
    5151        } while (0)
    5252
    53 #ifndef __ASM__
     53#ifndef __ASSEMBLER__
    5454
    55 #endif /* __ASM__ */
     55#endif /* __ASSEMBLER__ */
    5656
    5757#endif

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

    re0a4686 r53ad43c  
    4242#define FRAME_LOWPRIO  0
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545
    4646#define BOOT_PAGE_TABLE_SIZE     0x4000
    … …  
    8181#define physmem_print()
    8282
    83 #endif /* __ASM__ */
     83#endif /* __ASSEMBLER__ */
    8484
    8585#endif

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

    re0a4686 r53ad43c  
    4848
    4949#if (defined MACHINE_beagleboardxm) || (defined MACHINE_beaglebone)
    50 #ifndef __ASM__
     50#ifndef __ASSEMBLER__
    5151#       define KA2PA(x) ((uintptr_t) (x))
    5252#       define PA2KA(x) ((uintptr_t) (x))
    … …  
    5656#endif
    5757#else
    58 #ifndef __ASM__
     58#ifndef __ASSEMBLER__
    5959#       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
    6060#       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)

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

    re0a4686 r53ad43c  
    5454        1
    5555
    56 #ifndef __ASM__
     56#ifndef __ASSEMBLER__
    5757
    5858/** Level 0 page table entry. */
    … …  
    254254
    255255
    256 #endif /* __ASM__ */
     256#endif /* __ASSEMBLER__ */
    257257
    258258#endif

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

    re0a4686 r53ad43c  
    5454        (((pte_t *) (pte))->l1.descriptor_type != PTE_DESCRIPTOR_SMALL_PAGE_NX)
    5555
    56 #ifndef __ASM__
     56#ifndef __ASSEMBLER__
    5757
    5858/** Level 0 page table entry. */
    … …  
    319319extern void page_arch_init(void);
    320320
    321 #endif /* __ASM__ */
     321#endif /* __ASSEMBLER__ */
    322322
    323323#endif
Note: See TracChangeset for help on using the changeset viewer.