Changeset 8fc0d455 in mainline for arch/amd64/include


Ignore:
Timestamp:
2005-08-30T17:50:07Z (20 years ago)
Author:
Ondrej Palkovsky <ondrap@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9c0a9b3
Parents:
b45aa23
Message:

Code cleanup.

Location:
arch/amd64/include
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • arch/amd64/include/barrier.h

    rb45aa23 r8fc0d455  
    2727 */
    2828
    29 #ifndef __ppc_BARRIER_H__
    30 #define __ppc_BARRIER_H__
     29#ifndef __amd64_BARRIER_H__
     30#define __amd64_BARRIER_H__
    3131
    3232#define CS_ENTER_BARRIER()      __asm__ volatile ("" ::: "memory")

  • arch/amd64/include/boot/memmap.h

    rb45aa23 r8fc0d455  
    2727 */
    2828
    29 #ifndef __ia32_MEMMAP_H__
    30 #define __ia32_MEMMAP_H__
     29#ifndef __amd64_MEMMAP_H__
     30#define __amd64_MEMMAP_H__
    3131
    3232

  • arch/amd64/include/boot/memmapasm.h

    rb45aa23 r8fc0d455  
    2727 */
    2828
    29 #ifndef __ia32_MEMMAPASM_H__
    30 #define __ia32_MEMMAPASM_H__
     29#ifndef __amd64_MEMMAPASM_H__
     30#define __amd64_MEMMAPASM_H__
    3131
    3232

  • arch/amd64/include/interrupt.h

    rb45aa23 r8fc0d455  
    2727 */
    2828
    29 #ifndef __INTERRUPT_H__
    30 #define __INTERRUPT_H__
     29#ifndef __amd64_INTERRUPT_H__
     30#define __amd64_INTERRUPT_H__
    3131
    3232extern void interrupt(void);

  • arch/amd64/include/mm/frame.h

    rb45aa23 r8fc0d455  
    3232#define FRAME_SIZE              4096
    3333
     34#ifndef __ASM__
    3435extern void frame_arch_init(void);
     36#endif
    3537
    3638#endif

  • arch/amd64/include/mm/page.h

    rb45aa23 r8fc0d455  
    3030#define __amd64_PAGE_H__
    3131
    32 #include <mm/page.h>
    33 #include <arch/mm/frame.h>
    34 #include <arch/types.h>
    35 #include <arch/mm/ptl.h>
     32#ifndef __ASM__
     33#  include <mm/page.h>
     34#  include <arch/mm/frame.h>
     35#  include <arch/types.h>
     36#endif
    3637
    3738#define PAGE_SIZE       FRAME_SIZE
     39
     40#ifndef __ASM__
     41# define KA2PA(x)       (((__address) (x)) + 0x80000000)
     42# define PA2KA(x)       (((__address) (x)) - 0x80000000)
     43#else
     44# define KA2PA(x)       ((x) + 0x80000000)
     45# define PA2KA(x)       ((x)) - 0x80000000)
     46#endif
    3847
    3948#define PTL0_INDEX_ARCH(vaddr)          0
    … …  
    6574#define SET_FRAME_FLAGS_ARCH(ptl3, i, x)
    6675
     76#ifndef __ASM__
    6777extern void page_arch_init(void);
    6878
    69 typedef __u32 pte_t;
     79typedef __u64 pte_t;
     80#endif
    7081
    7182#endif

  • arch/amd64/include/mm/ptl.h

    rb45aa23 r8fc0d455  
    4040#define PTL_2MB_PAGE      (1<<7)
    4141
    42 #define KA2PA(x)        (((__address) (x)) + 0x80000000)
    43 #define PA2KA(x)        (((__address) (x)) - 0x80000000)
    44 
    4542
    4643#endif

  • arch/amd64/include/pm.h

    rb45aa23 r8fc0d455  
    2727 */
    2828
    29 #ifndef __PM_H__
    30 #define __PM_H__
     29#ifndef __amd64_PM_H__
     30#define __amd64_PM_H__
    3131
    32 #include <arch/types.h>
    33 #include <typedefs.h>
    34 #include <arch/context.h>
     32#ifndef __ASM__
     33# include <arch/types.h>
     34# include <typedefs.h>
     35# include <arch/context.h>
     36#endif
    3537
    3638#define IDT_ITEMS 64
    … …  
    4244#define UTEXT_DES       3
    4345#define UDATA_DES       4
    44 #define TSS_DES         5
     46#define KTEXT32_DES     5
     47#define TSS_DES         6
    4548
    4649#define selector(des)   ((des)<<3)
    … …  
    6164
    6265#define IO_MAP_BASE     (104)
     66
     67#ifndef __ASM__
    6368
    6469struct ptr_16_32 {
    … …  
    146151extern void tss_initialize(struct tss *t);
    147152
     153#endif /* __ASM__ */
     154
    148155#endif
Note: See TracChangeset for help on using the changeset viewer.