Changeset 8df5f20 in mainline for kernel/arch/ia64


Ignore:
Timestamp:
2019-02-11T14:56:26Z (6 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:
4805495
Parents:
391996b
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-01 23:26:21)
git-committer:
Jiří Zárevúcky <zarevucky.jiri@…> (2019-02-11 14:56:26)
Message:

Rename NO_TRACE to _NO_TRACE

<trace.h> may end up transitively included from standard headers,
so it needs to be a reserved identifier.

Location:
kernel/arch/ia64/include/arch
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r391996b r8df5f20  
    4545
    4646/** Map the I/O port address to a legacy I/O address. */
    47 NO_TRACE static inline uintptr_t p2a(volatile void *p)
     47_NO_TRACE static inline uintptr_t p2a(volatile void *p)
    4848{
    4949        uintptr_t prt = (uintptr_t) p;
    … …  
    5252}
    5353
    54 NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
     54_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v)
    5555{
    5656        if (port < (ioport8_t *) IO_SPACE_BOUNDARY)
    … …  
    6666}
    6767
    68 NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
     68_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v)
    6969{
    7070        if (port < (ioport16_t *) IO_SPACE_BOUNDARY)
    … …  
    8080}
    8181
    82 NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
     82_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v)
    8383{
    8484        if (port < (ioport32_t *) IO_SPACE_BOUNDARY)
    … …  
    9494}
    9595
    96 NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
     96_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port)
    9797{
    9898        uint8_t v;
    … …  
    116116}
    117117
    118 NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
     118_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port)
    119119{
    120120        uint16_t v;
    … …  
    138138}
    139139
    140 NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
     140_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port)
    141141{
    142142        uint32_t v;
    … …  
    166166 * The memory stack must start on page boundary.
    167167 */
    168 NO_TRACE static inline uintptr_t get_stack_base(void)
     168_NO_TRACE static inline uintptr_t get_stack_base(void)
    169169{
    170170        uint64_t value;
    … …  
    183183 *
    184184 */
    185 NO_TRACE static inline uint64_t psr_read(void)
     185_NO_TRACE static inline uint64_t psr_read(void)
    186186{
    187187        uint64_t v;
    … …  
    200200 *
    201201 */
    202 NO_TRACE static inline uint64_t iva_read(void)
     202_NO_TRACE static inline uint64_t iva_read(void)
    203203{
    204204        uint64_t v;
    … …  
    217217 *
    218218 */
    219 NO_TRACE static inline void iva_write(uint64_t v)
     219_NO_TRACE static inline void iva_write(uint64_t v)
    220220{
    221221        asm volatile (
    … …  
    231231 *
    232232 */
    233 NO_TRACE static inline uint64_t ivr_read(void)
     233_NO_TRACE static inline uint64_t ivr_read(void)
    234234{
    235235        uint64_t v;
    … …  
    243243}
    244244
    245 NO_TRACE static inline uint64_t cr64_read(void)
     245_NO_TRACE static inline uint64_t cr64_read(void)
    246246{
    247247        uint64_t v;
    … …  
    260260 *
    261261 */
    262 NO_TRACE static inline void itc_write(uint64_t v)
     262_NO_TRACE static inline void itc_write(uint64_t v)
    263263{
    264264        asm volatile (
    … …  
    273273 *
    274274 */
    275 NO_TRACE static inline uint64_t itc_read(void)
     275_NO_TRACE static inline uint64_t itc_read(void)
    276276{
    277277        uint64_t v;
    … …  
    290290 *
    291291 */
    292 NO_TRACE static inline void itm_write(uint64_t v)
     292_NO_TRACE static inline void itm_write(uint64_t v)
    293293{
    294294        asm volatile (
    … …  
    303303 *
    304304 */
    305 NO_TRACE static inline uint64_t itm_read(void)
     305_NO_TRACE static inline uint64_t itm_read(void)
    306306{
    307307        uint64_t v;
    … …  
    320320 *
    321321 */
    322 NO_TRACE static inline uint64_t itv_read(void)
     322_NO_TRACE static inline uint64_t itv_read(void)
    323323{
    324324        uint64_t v;
    … …  
    337337 *
    338338 */
    339 NO_TRACE static inline void itv_write(uint64_t v)
     339_NO_TRACE static inline void itv_write(uint64_t v)
    340340{
    341341        asm volatile (
    … …  
    350350 *
    351351 */
    352 NO_TRACE static inline void eoi_write(uint64_t v)
     352_NO_TRACE static inline void eoi_write(uint64_t v)
    353353{
    354354        asm volatile (
    … …  
    363363 *
    364364 */
    365 NO_TRACE static inline uint64_t tpr_read(void)
     365_NO_TRACE static inline uint64_t tpr_read(void)
    366366{
    367367        uint64_t v;
    … …  
    380380 *
    381381 */
    382 NO_TRACE static inline void tpr_write(uint64_t v)
     382_NO_TRACE static inline void tpr_write(uint64_t v)
    383383{
    384384        asm volatile (
    … …  
    396396 *
    397397 */
    398 NO_TRACE static ipl_t interrupts_disable(void)
     398_NO_TRACE static ipl_t interrupts_disable(void)
    399399{
    400400        uint64_t v;
    … …  
    418418 *
    419419 */
    420 NO_TRACE static ipl_t interrupts_enable(void)
     420_NO_TRACE static ipl_t interrupts_enable(void)
    421421{
    422422        uint64_t v;
    … …  
    441441 *
    442442 */
    443 NO_TRACE static inline void interrupts_restore(ipl_t ipl)
     443_NO_TRACE static inline void interrupts_restore(ipl_t ipl)
    444444{
    445445        if (ipl & PSR_I_MASK)
    … …  
    454454 *
    455455 */
    456 NO_TRACE static inline ipl_t interrupts_read(void)
     456_NO_TRACE static inline ipl_t interrupts_read(void)
    457457{
    458458        return (ipl_t) psr_read();
    … …  
    464464 *
    465465 */
    466 NO_TRACE static inline bool interrupts_disabled(void)
     466_NO_TRACE static inline bool interrupts_disabled(void)
    467467{
    468468        return !(psr_read() & PSR_I_MASK);
    … …  
    470470
    471471/** Disable protection key checking. */
    472 NO_TRACE static inline void pk_disable(void)
     472_NO_TRACE static inline void pk_disable(void)
    473473{
    474474        asm volatile (

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

    r391996b r8df5f20  
    6464 *
    6565 */
    66 NO_TRACE static inline uint64_t cpuid_read(int n)
     66_NO_TRACE static inline uint64_t cpuid_read(int n)
    6767{
    6868        uint64_t v;
    … …  
    7777}
    7878
    79 NO_TRACE static inline int ia64_get_cpu_id(void)
     79_NO_TRACE static inline int ia64_get_cpu_id(void)
    8080{
    8181        uint64_t cr64 = cr64_read();
    … …  
    8383}
    8484
    85 NO_TRACE static inline int ia64_get_cpu_eid(void)
     85_NO_TRACE static inline int ia64_get_cpu_eid(void)
    8686{
    8787        uint64_t cr64 = cr64_read();
    … …  
    8989}
    9090
    91 NO_TRACE static inline void ipi_send_ipi(int id, int eid, int intno)
     91_NO_TRACE static inline void ipi_send_ipi(int id, int eid, int intno)
    9292{
    9393        (bootinfo->sapic)[2 * (id * 256 + eid)] = intno;

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

    r391996b r8df5f20  
    3838#include <trace.h>
    3939
    40 NO_TRACE static inline uint64_t get_cycle(void)
     40_NO_TRACE static inline uint64_t get_cycle(void)
    4141{
    4242        return 0;

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

    r391996b r8df5f20  
    5050#endif /* KERNEL */
    5151
    52 NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
     52_NO_TRACE static inline void istate_set_retaddr(istate_t *istate,
    5353    uintptr_t retaddr)
    5454{
    … …  
    5757}
    5858
    59 NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
     59_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate)
    6060{
    6161        return istate->cr_iip;
    6262}
    6363
    64 NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
     64_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate)
    6565{
    6666        /* FIXME */
    … …  
    6969}
    7070
    71 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
     71_NO_TRACE static inline int istate_from_uspace(istate_t *istate)
    7272{
    7373        return (istate->cr_iip) < 0xe000000000000000ULL;

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

    r391996b r8df5f20  
    191191 * @return Address of the head of VHPT collision chain.
    192192 */
    193 NO_TRACE static inline uint64_t thash(uint64_t va)
     193_NO_TRACE static inline uint64_t thash(uint64_t va)
    194194{
    195195        uint64_t ret;
    … …  
    213213 * @return The unique tag for VPN and RID in the collision chain returned by thash().
    214214 */
    215 NO_TRACE static inline uint64_t ttag(uint64_t va)
     215_NO_TRACE static inline uint64_t ttag(uint64_t va)
    216216{
    217217        uint64_t ret;
    … …  
    232232 * @return Current contents of rr[i].
    233233 */
    234 NO_TRACE static inline uint64_t rr_read(size_t i)
     234_NO_TRACE static inline uint64_t rr_read(size_t i)
    235235{
    236236        uint64_t ret;
    … …  
    252252 * @param v Value to be written to rr[i].
    253253 */
    254 NO_TRACE static inline void rr_write(size_t i, uint64_t v)
     254_NO_TRACE static inline void rr_write(size_t i, uint64_t v)
    255255{
    256256        assert(i < REGION_REGISTERS);
    … …  
    267267 * @return Current value stored in PTA.
    268268 */
    269 NO_TRACE static inline uint64_t pta_read(void)
     269_NO_TRACE static inline uint64_t pta_read(void)
    270270{
    271271        uint64_t ret;
    … …  
    283283 * @param v New value to be stored in PTA.
    284284 */
    285 NO_TRACE static inline void pta_write(uint64_t v)
     285_NO_TRACE static inline void pta_write(uint64_t v)
    286286{
    287287        asm volatile (
Note: See TracChangeset for help on using the changeset viewer.