Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for kernel/arch/ia64/include/bootinfo.h


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
051bc69a
Parents:
6c39a907 (diff), 1317380 (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 mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia64/include/bootinfo.h

    r6c39a907 r25a76ab8  
    3232#define BOOTINFO_ADDRESS 0x4401000
    3333
    34 #define CONFIG_INIT_TASKS       32
     34#define TASKMAP_MAX_RECORDS  32
    3535
    3636#define MEMMAP_ITEMS 128
     
    4444
    4545typedef struct {
    46         void *addr; 
    47         unsigned long size;
     46        void *addr;
     47        size_t size;
    4848        char name[BOOTINFO_TASK_NAME_BUFLEN];
    4949} binit_task_t;
    5050       
    5151typedef struct {
    52         unsigned long count;
    53         binit_task_t tasks[CONFIG_INIT_TASKS];
     52        size_t cnt;
     53        binit_task_t tasks[TASKMAP_MAX_RECORDS];
    5454} binit_t;
    5555
     
    5858        unsigned long base;
    5959        unsigned long size;
    60 }efi_memmap_item_t;
    61 
     60} efi_memmap_item_t;
    6261
    6362typedef struct {
    6463        binit_t taskmap;
    65 
     64       
    6665        efi_memmap_item_t memmap[MEMMAP_ITEMS];
    6766        unsigned int memmap_items;
    68 
     67       
    6968        unative_t *sapic;
    7069        unsigned long sys_freq;
Note: See TracChangeset for help on using the changeset viewer.