Changeset 53ad43c in mainline for kernel/arch/ia64


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/ia64/include/arch
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/include/arch/interrupt.h

    re0a4686 r53ad43c  
    3636#define KERN_ia64_INTERRUPT_H_
    3737
    38 #ifndef __ASM__
     38#ifndef __ASSEMBLER__
    3939#include <arch/istate.h>
    4040#include <stdint.h>
    … …  
    8383#define EOI  0  /**< The actual value doesn't matter. */
    8484
    85 #ifndef __ASM__
     85#ifndef __ASSEMBLER__
    8686extern void *ivt;
    8787

  • kernel/arch/ia64/include/arch/mm/asid.h

    re0a4686 r53ad43c  
    3636#define KERN_ia64_ASID_H_
    3737
    38 #ifndef __ASM__
     38#ifndef __ASSEMBLER__
    3939
    4040#include <stdint.h>
    … …  
    4343typedef uint32_t rid_t;
    4444
    45 #endif  /* __ASM__ */
     45#endif  /* __ASSEMBLER__ */
    4646
    4747/**

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <typedefs.h>
    … …  
    5151#define physmem_print()
    5252
    53 #endif /* __ASM__ */
     53#endif /* __ASSEMBLER__ */
    5454
    5555#endif

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

    re0a4686 r53ad43c  
    3939#include <arch/mm/frame.h>
    4040
    41 #ifndef __ASM__
     41#ifndef __ASSEMBLER__
    4242#include <assert.h>
    4343#endif
    … …  
    5555#define VA2VRN(va)  ((va) >> VRN_SHIFT)
    5656
    57 #ifdef __ASM__
     57#ifdef __ASSEMBLER__
    5858        #define VRN_KERNEL  7
    5959#else
    … …  
    8484#define AR_WRITE    0x02
    8585
    86 #ifndef __ASM__
     86#ifndef __ASSEMBLER__
    8787
    8888#include <arch/mm/as.h>
    … …  
    297297extern void vhpt_set_record(vhpt_entry_t *v, uintptr_t page, asid_t asid, uintptr_t frame, int flags);
    298298
    299 #endif /* __ASM__ */
     299#endif /* __ASSEMBLER__ */
    300300
    301301#endif

  • kernel/arch/ia64/include/arch/register.h

    re0a4686 r53ad43c  
    143143/* CR82-CR127 are reserved */
    144144
    145 #ifndef __ASM__
     145#ifndef __ASSEMBLER__
    146146
    147147/** Processor Status Register. */
    … …  
    269269} cpuid3_t;
    270270
    271 #endif /* !__ASM__ */
     271#endif /* !__ASSEMBLER__ */
    272272
    273273#endif
Note: See TracChangeset for help on using the changeset viewer.