Changeset 76ca3f7 in mainline for kernel/arch/ia64


Ignore:
Timestamp:
2010-03-23T20:49:54Z (16 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e417b96
Parents:
b48ebd19 (diff), 63f8966 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mailnline changes, revision 329

Location:
kernel/arch/ia64
Files:
21 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/Makefile.inc

    rb48ebd19 r76ca3f7  
    2727#
    2828
    29 ## Toolchain configuration
    30 #
    31 
    3229BFD_NAME = elf64-little
    3330BFD_ARCH = ia64-elf64
    34 TARGET = ia64-pc-linux-gnu
    35 TOOLCHAIN_DIR = $(CROSS_PREFIX)/ia64
    3631
    3732CMN1 = -mconstant-gp -fno-unwind-tables -mfixed-range=f32-f127
    … …  
    3934ICC_CFLAGS += $(CMN1)
    4035
    41 LFLAGS += -EL
    42 AFLAGS += -mconstant-gp
     36LFLAGS = -EL
     37AFLAGS = -mconstant-gp
    4338
    4439BITS = 64

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

    rb48ebd19 r76ca3f7  
    3838#include <config.h>
    3939#include <typedefs.h>
    40 #include <arch/types.h>
     40#include <typedefs.h>
    4141#include <arch/register.h>
    4242

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

    rb48ebd19 r76ca3f7  
    6767        unsigned int memmap_items;
    6868
    69         unsigned long * sapic;
     69        unative_t *sapic;
    7070        unsigned long sys_freq;
    7171        unsigned long freq_scale;

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

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia64_CONTEXT_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <arch/register.h>
    4040#include <align.h>

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

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia64_CPU_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <arch/register.h>
    4040#include <arch/asm.h>

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

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia64_FADDR_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939
    4040/**

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

    rb48ebd19 r76ca3f7  
    3838#define FPU_CONTEXT_ALIGN 16
    3939
    40 #include <arch/types.h>
     40#include <typedefs.h>
    4141
    4242#define FRS 96

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

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia64_INTERRUPT_H_
    3737
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <arch/register.h>
    4040

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

    rb48ebd19 r76ca3f7  
    3838#ifndef __ASM__
    3939
    40 #include <arch/types.h>
     40#include <typedefs.h>
    4141
    4242typedef uint16_t asid_t;

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

    rb48ebd19 r76ca3f7  
    4242#ifndef __ASM__
    4343
    44 #include <arch/types.h>
     44#include <typedefs.h>
    4545
    4646extern uintptr_t last_frame;

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

    rb48ebd19 r76ca3f7  
    108108#include <arch/barrier.h>
    109109#include <arch/mm/asid.h>
    110 #include <arch/types.h>
     110#include <typedefs.h>
    111111#include <debug.h>
    112112

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

    rb48ebd19 r76ca3f7  
    3939#include <arch/mm/asid.h>
    4040#include <arch/interrupt.h>
    41 #include <arch/types.h>
     41#include <typedefs.h>
    4242
    4343/** Data and instruction Translation Register indices. */

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

    rb48ebd19 r76ca3f7  
    142142#ifndef __ASM__
    143143
    144 #include <arch/types.h>
     144#include <typedefs.h>
    145145
    146146/** Processor Status Register. */

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

    rb48ebd19 r76ca3f7  
    3636#define KERN_ia64_TYPES_H_
    3737
    38 typedef signed char int8_t;
    39 typedef signed short int16_t;
    40 typedef signed int int32_t;
    41 typedef signed long int64_t;
    42 typedef struct {
    43         int64_t lo;
    44         int64_t hi;
    45 } int128_t;
    46 
    47 typedef unsigned char uint8_t;
    48 typedef unsigned short uint16_t;
    49 typedef unsigned int uint32_t;
    50 typedef unsigned long uint64_t;
    51 typedef struct {
    52         uint64_t lo;
    53         uint64_t hi;
    54 } uint128_t;
    55 
    5638typedef uint64_t size_t;
    5739
    … …  
    7052} __attribute__((may_alias)) fncptr_t;
    7153
    72 #define PRIp "lx"       /**< Format for uintptr_t. */
    73 #define PRIs "lu"       /**< Format for size_t. */
     54#define PRIp "lx"  /**< Format for uintptr_t. */
     55#define PRIs "lu"  /**< Format for size_t. */
    7456
    75 #define PRId8 "d"       /**< Format for int8_t. */
    76 #define PRId16 "d"      /**< Format for int16_t. */
    77 #define PRId32 "d"      /**< Format for int32_t. */
    78 #define PRId64 "ld"     /**< Format for int64_t. */
    79 #define PRIdn "d"       /**< Format for native_t. */
     57#define PRId8 "d"    /**< Format for int8_t. */
     58#define PRId16 "d"   /**< Format for int16_t. */
     59#define PRId32 "d"   /**< Format for int32_t. */
     60#define PRId64 "ld"  /**< Format for int64_t. */
     61#define PRIdn "d"    /**< Format for native_t. */
    8062
    81 #define PRIu8 "u"       /**< Format for uint8_t. */
    82 #define PRIu16 "u"      /**< Format for uint16_t. */
    83 #define PRIu32 "u"      /**< Format for uint32_t. */
    84 #define PRIu64 "lu"     /**< Format for uint64_t. */
    85 #define PRIun "u"       /**< Format for unative_t. */
     63#define PRIu8 "u"    /**< Format for uint8_t. */
     64#define PRIu16 "u"   /**< Format for uint16_t. */
     65#define PRIu32 "u"   /**< Format for uint32_t. */
     66#define PRIu64 "lu"  /**< Format for uint64_t. */
     67#define PRIun "u"    /**< Format for unative_t. */
    8668
    87 #define PRIx8 "x"       /**< Format for hexadecimal (u)int8_t. */
    88 #define PRIx16 "x"      /**< Format for hexadecimal (u)int16_t. */
    89 #define PRIx32 "x"      /**< Format for hexadecimal (u)uint32_t. */
    90 #define PRIx64 "lx"     /**< Format for hexadecimal (u)int64_t. */
    91 #define PRIxn "x"       /**< Format for hexadecimal (u)native_t. */
     69#define PRIx8 "x"    /**< Format for hexadecimal (u)int8_t. */
     70#define PRIx16 "x"   /**< Format for hexadecimal (u)int16_t. */
     71#define PRIx32 "x"   /**< Format for hexadecimal (u)uint32_t. */
     72#define PRIx64 "lx"  /**< Format for hexadecimal (u)int64_t. */
     73#define PRIxn "x"    /**< Format for hexadecimal (u)native_t. */
    9274
    9375#endif

  • kernel/arch/ia64/src/ddi/ddi.c

    rb48ebd19 r76ca3f7  
    3636#include <ddi/ddi.h>
    3737#include <proc/task.h>
    38 #include <arch/types.h>
     38#include <typedefs.h>
    3939#include <mm/slab.h>
    4040#include <errno.h>

  • kernel/arch/ia64/src/debug/stacktrace.c

    rb48ebd19 r76ca3f7  
    3535#include <stacktrace.h>
    3636#include <syscall/copy.h>
    37 #include <arch/types.h>
    3837#include <typedefs.h>
    3938

  • kernel/arch/ia64/src/drivers/ski.c

    rb48ebd19 r76ca3f7  
    3737#include <console/chardev.h>
    3838#include <sysinfo/sysinfo.h>
    39 #include <arch/types.h>
     39#include <typedefs.h>
    4040#include <proc/thread.h>
    4141#include <synch/spinlock.h>
    4242#include <arch/asm.h>
    4343#include <arch/drivers/kbd.h>
    44 #include <string.h>
     44#include <str.h>
    4545#include <arch.h>
    4646

  • kernel/arch/ia64/src/ia64.c

    rb48ebd19 r76ca3f7  
    4040#include <arch/asm.h>
    4141#include <arch/register.h>
    42 #include <arch/types.h>
     42#include <typedefs.h>
    4343#include <arch/context.h>
    4444#include <arch/stack.h>
    … …  
    6666#include <print.h>
    6767#include <sysinfo/sysinfo.h>
    68 #include <string.h>
     68#include <str.h>
    6969
    7070/* NS16550 as a COM 1 */

  • kernel/arch/ia64/src/interrupt.c

    rb48ebd19 r76ca3f7  
    4141#include <debug.h>
    4242#include <console/console.h>
    43 #include <arch/types.h>
     43#include <typedefs.h>
    4444#include <arch/asm.h>
    4545#include <arch/barrier.h>

  • kernel/arch/ia64/src/mm/page.c

    rb48ebd19 r76ca3f7  
    3939#include <arch/mm/asid.h>
    4040#include <arch/mm/vhpt.h>
    41 #include <arch/types.h>
     41#include <typedefs.h>
    4242#include <print.h>
    4343#include <mm/page.h>

  • kernel/arch/ia64/src/smp/smp.c

    rb48ebd19 r76ca3f7  
    4040#include <arch/asm.h>
    4141#include <arch/register.h>
    42 #include <arch/types.h>
     42#include <typedefs.h>
    4343#include <arch/context.h>
    4444#include <arch/stack.h>
Note: See TracChangeset for help on using the changeset viewer.