Changeset 53ad43c in mainline for kernel/arch/mips32/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/arch/mips32/include/arch/mm
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545extern void frame_low_arch_init(void);
    … …  
    4747extern void physmem_print(void);
    4848
    49 #endif /* __ASM__ */
     49#endif /* __ASSEMBLER__ */
    5050
    5151#endif

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

    re0a4686 r53ad43c  
    4242#define PAGE_SIZE       FRAME_SIZE
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545#       define KA2PA(x) (((uintptr_t) (x)) - 0x80000000)
    4646#       define PA2KA(x) (((uintptr_t) (x)) + 0x80000000)
    … …  
    143143#define PTE_EXECUTABLE_ARCH(pte)        1
    144144
    145 #ifndef __ASM__
     145#ifndef __ASSEMBLER__
    146146
    147147#include <mm/mm.h>
    … …  
    199199extern void page_arch_init(void);
    200200
    201 #endif /* __ASM__ */
     201#endif /* __ASSEMBLER__ */
    202202
    203203#endif
Note: See TracChangeset for help on using the changeset viewer.