Changeset 53ad43c in mainline for kernel/arch/ia32


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/ia32/include/arch
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    re0a4686 r53ad43c  
    4040#define BOOT_STACK_SIZE  0x0400
    4141
    42 #ifndef __ASM__
     42#ifndef __ASSEMBLER__
    4343
    4444#ifdef CONFIG_SMP
    … …  
    4949#endif /* CONFIG_SMP */
    5050
    51 #endif /* __ASM__ */
     51#endif /* __ASSEMBLER__ */
    5252
    5353#endif

  • kernel/arch/ia32/include/arch/boot/memmap.h

    re0a4686 r53ad43c  
    6161#define MEMMAP_E820_MAX_RECORDS  32
    6262
    63 #ifndef __ASM__
     63#ifndef __ASSEMBLER__
    6464
    6565#include <stdint.h>

  • kernel/arch/ia32/include/arch/cpu.h

    re0a4686 r53ad43c  
    6464#define IA32_MSR_SYSENTER_EIP   0x176
    6565
    66 #ifndef __ASM__
     66#ifndef __ASSEMBLER__
    6767
    6868#include <arch/pm.h>

  • kernel/arch/ia32/include/arch/cpuid.h

    re0a4686 r53ad43c  
    4141#define INTEL_SEP             11
    4242
    43 #ifndef __ASM__
     43#ifndef __ASSEMBLER__
    4444
    4545#include <arch/cpu.h>
    … …  
    116116}
    117117
    118 #endif /* !def __ASM__ */
     118#endif /* !def __ASSEMBLER__ */
    119119#endif
    120120

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

    re0a4686 r53ad43c  
    4141#define FRAME_LOWPRIO  0x1000
    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/ia32/include/arch/mm/page.h

    re0a4686 r53ad43c  
    5050#define PDE_4M          (1 << 7)
    5151
    52 #ifndef __ASM__
     52#ifndef __ASSEMBLER__
    5353
    5454#define KA2PA(x)  (((uintptr_t) (x)) - UINT32_C(0x80000000))
    5555#define PA2KA(x)  (((uintptr_t) (x)) + UINT32_C(0x80000000))
    5656
    57 #else /* __ASM__ */
     57#else /* __ASSEMBLER__ */
    5858
    5959#define KA2PA(x)  ((x) - 0x80000000)
    6060#define PA2KA(x)  ((x) + 0x80000000)
    6161
    62 #endif /* __ASM__ */
     62#endif /* __ASSEMBLER__ */
    6363
    6464/*
    … …  
    142142#define PTE_EXECUTABLE_ARCH(p)  1
    143143
    144 #ifndef __ASM__
     144#ifndef __ASSEMBLER__
    145145
    146146#include <mm/mm.h>
    … …  
    220220extern void page_fault(unsigned int, istate_t *);
    221221
    222 #endif /* __ASM__ */
     222#endif /* __ASSEMBLER__ */
    223223
    224224#endif

  • kernel/arch/ia32/include/arch/pm.h

    re0a4686 r53ad43c  
    8181#define IO_PORTS  (64 * 1024)
    8282
    83 #ifndef __ASM__
     83#ifndef __ASSEMBLER__
    8484
    8585#include <typedefs.h>
    … …  
    170170extern void tss_initialize(tss_t *t);
    171171
    172 #endif /* __ASM__ */
     172#endif /* __ASSEMBLER__ */
    173173
    174174#endif

  • kernel/arch/ia32/include/arch/smp/apic.h

    re0a4686 r53ad43c  
    3939#define IO_APIC_BASE    0xfec00000
    4040
    41 #ifndef __ASM__
     41#ifndef __ASSEMBLER__
    4242
    4343#include <cpu.h>
    … …  
    369369extern void io_apic_enable_irqs(uint16_t);
    370370
    371 #endif  /* __ASM__ */
     371#endif  /* __ASSEMBLER__ */
    372372
    373373#endif

  • kernel/arch/ia32/include/arch/vreg.h

    re0a4686 r53ad43c  
    3838#define VREG_TP 0
    3939
    40 #ifndef __ASM__
     40#ifndef __ASSEMBLER__
    4141
    4242#include <stdint.h>
    … …  
    4646extern void vreg_init(void);
    4747
    48 #endif /* __ASM__ */
     48#endif /* __ASSEMBLER__ */
    4949
    5050#endif
Note: See TracChangeset for help on using the changeset viewer.