diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 05:38:34 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 05:38:34 +0400 |
| commit | 0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e (patch) | |
| tree | 4d1f97d241b692ad8f7aeca9c5b773fbabfae258 /arch/ia64/include/uapi/asm/setup.h | |
| parent | ade0899b298ba2c43bfd6abd8cbc2545944cde0c (diff) | |
| parent | d536e0db2433686238ec97c517e4fc691000ee6f (diff) | |
| download | linux-0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e.tar.xz | |
Merge tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 UAPI changes from Tony Luck:
"ia64 pieces of David Howells great UAPI include file move"
* tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
UAPI: (Scripted) Disintegrate arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/uapi/asm/setup.h')
| -rw-r--r-- | arch/ia64/include/uapi/asm/setup.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/ia64/include/uapi/asm/setup.h b/arch/ia64/include/uapi/asm/setup.h new file mode 100644 index 000000000000..8d56458310b3 --- /dev/null +++ b/arch/ia64/include/uapi/asm/setup.h @@ -0,0 +1,24 @@ +#ifndef __IA64_SETUP_H +#define __IA64_SETUP_H + +#define COMMAND_LINE_SIZE 2048 + +extern struct ia64_boot_param { + __u64 command_line; /* physical address of command line arguments */ + __u64 efi_systab; /* physical address of EFI system table */ + __u64 efi_memmap; /* physical address of EFI memory map */ + __u64 efi_memmap_size; /* size of EFI memory map */ + __u64 efi_memdesc_size; /* size of an EFI memory map descriptor */ + __u32 efi_memdesc_version; /* memory descriptor version */ + struct { + __u16 num_cols; /* number of columns on console output device */ + __u16 num_rows; /* number of rows on console output device */ + __u16 orig_x; /* cursor's x position */ + __u16 orig_y; /* cursor's y position */ + } console_info; + __u64 fpswa; /* physical address of the fpswa interface */ + __u64 initrd_start; + __u64 initrd_size; +} *ia64_boot_param; + +#endif |