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

Legend:

Unmodified
Added
Removed

  • kernel/arch/ppc32/include/arch/boot/boot.h

    re0a4686 r53ad43c  
    4242#define BOOTINFO_TASK_NAME_BUFLEN  32
    4343
    44 #ifndef __ASM__
     44#ifndef __ASSEMBLER__
    4545
    4646#include <config.h>

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <stdint.h>
    … …  
    6262extern void physmem_print(void);
    6363
    64 #endif /* __ASM__ */
     64#endif /* __ASSEMBLER__ */
    6565
    6666#endif

  • kernel/arch/ppc32/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)
    … …  
    146146#define PTE_EXECUTABLE_ARCH(pte)  1
    147147
    148 #ifndef __ASM__
     148#ifndef __ASSEMBLER__
    149149
    150150#include <mm/mm.h>
    … …  
    194194extern void page_arch_init(void);
    195195
    196 #endif /* __ASM__ */
     196#endif /* __ASSEMBLER__ */
    197197
    198198#endif
Note: See TracChangeset for help on using the changeset viewer.