History

Merge branch 'for-4.7/libnvdimm' into libnvdimm-for-next

Dan Williams committed 10 years ago

Commit 21596692 parents 594d6d9 9dec4896 files · +158 −6Browse files

Showing the changes to include/uapi (1 of 6 files). Show all

Unified · Split

include/uapi/linux/ndctl.h+35−1
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (c) 2014-2015, Intel Corporation.2 * Copyright (c) 2014-2016, Intel Corporation.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify it4 * This program is free software; you can redistribute it and/or modify it
5 * under the terms and conditions of the GNU Lesser General Public License,5 * under the terms and conditions of the GNU Lesser General Public License,
@@ -20,11 +20,45 @@ struct nd_cmd_smart { · 14 unmodified lines
20 __u8 data[128];20 __u8 data[128];
21} __packed;21} __packed;
22 22
23#define ND_SMART_HEALTH_VALID (1 << 0)
24#define ND_SMART_TEMP_VALID (1 << 1)
25#define ND_SMART_SPARES_VALID (1 << 2)
26#define ND_SMART_ALARM_VALID (1 << 3)
27#define ND_SMART_USED_VALID (1 << 4)
28#define ND_SMART_SHUTDOWN_VALID (1 << 5)
29#define ND_SMART_VENDOR_VALID (1 << 6)
30#define ND_SMART_TEMP_TRIP (1 << 0)
31#define ND_SMART_SPARE_TRIP (1 << 1)
32#define ND_SMART_NON_CRITICAL_HEALTH (1 << 0)
33#define ND_SMART_CRITICAL_HEALTH (1 << 1)
34#define ND_SMART_FATAL_HEALTH (1 << 2)
35
36struct nd_smart_payload {
37 __u32 flags;
38 __u8 reserved0[4];
39 __u8 health;
40 __u16 temperature;
41 __u8 spares;
42 __u8 alarm_flags;
43 __u8 life_used;
44 __u8 shutdown_state;
45 __u8 reserved1;
46 __u32 vendor_size;
47 __u8 vendor_data[108];
48} __packed;
49
23struct nd_cmd_smart_threshold {50struct nd_cmd_smart_threshold {
24 __u32 status;51 __u32 status;
25 __u8 data[8];52 __u8 data[8];
26} __packed;53} __packed;
27 54
55struct nd_smart_threshold_payload {
56 __u16 alarm_control;
57 __u16 temperature;
58 __u8 spares;
59 __u8 reserved[3];
60} __packed;
61
28struct nd_cmd_dimm_flags {62struct nd_cmd_dimm_flags {
29 __u32 status;63 __u32 status;
30 __u32 flags;64 __u32 flags;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t