diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-10-19 15:19:19 -0400 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-10-19 15:19:19 -0400 |
| commit | e05dacd71db0a5da7c1a44bcaab2a8a240b9c233 (patch) | |
| tree | 31382cf1c7d62c03126448affb2fc86e8c4aaa8b /include/uapi/linux/utsname.h | |
| parent | 3ab0b83bf6a1e834f4b884150d8012990c75d25d (diff) | |
| parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
Merge commit 'v3.7-rc1' into stable/for-linus-3.7
* commit 'v3.7-rc1': (10892 commits)
Linux 3.7-rc1
x86, boot: Explicitly include autoconf.h for hostprogs
perf: Fix UAPI fallout
ARM: config: make sure that platforms are ordered by option string
ARM: config: sort select statements alphanumerically
UAPI: (Scripted) Disintegrate include/linux/byteorder
UAPI: (Scripted) Disintegrate include/linux
UAPI: Unexport linux/blk_types.h
UAPI: Unexport part of linux/ppp-comp.h
perf: Handle new rbtree implementation
procfs: don't need a PATH_MAX allocation to hold a string representation of an int
vfs: embed struct filename inside of names_cache allocation if possible
audit: make audit_inode take struct filename
vfs: make path_openat take a struct filename pointer
vfs: turn do_path_lookup into wrapper around struct filename variant
audit: allow audit code to satisfy getname requests from its names_list
vfs: define struct filename and have getname() return it
btrfs: Fix compilation with user namespace support enabled
userns: Fix posix_acl_file_xattr_userns gid conversion
userns: Properly print bluetooth socket uids
...
Diffstat (limited to 'include/uapi/linux/utsname.h')
| -rw-r--r-- | include/uapi/linux/utsname.h | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/include/uapi/linux/utsname.h b/include/uapi/linux/utsname.h new file mode 100644 index 000000000000..872c2df10de7 --- /dev/null +++ b/include/uapi/linux/utsname.h | |||
| @@ -0,0 +1,34 @@ | |||
| 1 | #ifndef _UAPI_LINUX_UTSNAME_H | ||
| 2 | #define _UAPI_LINUX_UTSNAME_H | ||
| 3 | |||
| 4 | #define __OLD_UTS_LEN 8 | ||
| 5 | |||
| 6 | struct oldold_utsname { | ||
| 7 | char sysname[9]; | ||
| 8 | char nodename[9]; | ||
| 9 | char release[9]; | ||
| 10 | char version[9]; | ||
| 11 | char machine[9]; | ||
| 12 | }; | ||
| 13 | |||
| 14 | #define __NEW_UTS_LEN 64 | ||
| 15 | |||
| 16 | struct old_utsname { | ||
| 17 | char sysname[65]; | ||
| 18 | char nodename[65]; | ||
| 19 | char release[65]; | ||
| 20 | char version[65]; | ||
| 21 | char machine[65]; | ||
| 22 | }; | ||
| 23 | |||
| 24 | struct new_utsname { | ||
| 25 | char sysname[__NEW_UTS_LEN + 1]; | ||
| 26 | char nodename[__NEW_UTS_LEN + 1]; | ||
| 27 | char release[__NEW_UTS_LEN + 1]; | ||
| 28 | char version[__NEW_UTS_LEN + 1]; | ||
| 29 | char machine[__NEW_UTS_LEN + 1]; | ||
| 30 | char domainname[__NEW_UTS_LEN + 1]; | ||
| 31 | }; | ||
| 32 | |||
| 33 | |||
| 34 | #endif /* _UAPI_LINUX_UTSNAME_H */ | ||
