History

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

Dan Williams committed 10 years ago

Commit 178d6f42 parents db58028 98a29c320 files · +1559 −517Browse files

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

Unified · Split

include/uapi/linux/ndctl.h+17−13
@@ -21,14 +21,16 @@ struct nd_cmd_smart { · 20 unmodified lines
21} __packed;21} __packed;
22 22
23#define ND_SMART_HEALTH_VALID (1 << 0)23#define ND_SMART_HEALTH_VALID (1 << 0)
24#define ND_SMART_TEMP_VALID (1 << 1)24#define ND_SMART_SPARES_VALID (1 << 1)
25#define ND_SMART_SPARES_VALID (1 << 2)25#define ND_SMART_USED_VALID (1 << 2)
26#define ND_SMART_ALARM_VALID (1 << 3)26#define ND_SMART_TEMP_VALID (1 << 3)
27#define ND_SMART_USED_VALID (1 << 4)27#define ND_SMART_CTEMP_VALID (1 << 4)
28#define ND_SMART_SHUTDOWN_VALID (1 << 5)28#define ND_SMART_ALARM_VALID (1 << 9)
29#define ND_SMART_VENDOR_VALID (1 << 6)29#define ND_SMART_SHUTDOWN_VALID (1 << 10)
30#define ND_SMART_TEMP_TRIP (1 << 0)30#define ND_SMART_VENDOR_VALID (1 << 11)
31#define ND_SMART_SPARE_TRIP (1 << 1)31#define ND_SMART_SPARE_TRIP (1 << 0)
32#define ND_SMART_TEMP_TRIP (1 << 1)
33#define ND_SMART_CTEMP_TRIP (1 << 2)
32#define ND_SMART_NON_CRITICAL_HEALTH (1 << 0)34#define ND_SMART_NON_CRITICAL_HEALTH (1 << 0)
33#define ND_SMART_CRITICAL_HEALTH (1 << 1)35#define ND_SMART_CRITICAL_HEALTH (1 << 1)
34#define ND_SMART_FATAL_HEALTH (1 << 2)36#define ND_SMART_FATAL_HEALTH (1 << 2)
@@ -37,14 +39,15 @@ struct nd_smart_payload { · 2 unmodified lines
37 __u32 flags;39 __u32 flags;
38 __u8 reserved0[4];40 __u8 reserved0[4];
39 __u8 health;41 __u8 health;
40 __u16 temperature;
41 __u8 spares;42 __u8 spares;
42 __u8 alarm_flags;
43 __u8 life_used;43 __u8 life_used;
44 __u8 alarm_flags;
45 __u16 temperature;
46 __u16 ctrl_temperature;
47 __u8 reserved1[15];
44 __u8 shutdown_state;48 __u8 shutdown_state;
45 __u8 reserved1;
46 __u32 vendor_size;49 __u32 vendor_size;
47 __u8 vendor_data[108];50 __u8 vendor_data[92];
48} __packed;51} __packed;
49 52
50struct nd_cmd_smart_threshold {53struct nd_cmd_smart_threshold {
@@ -53,7 +56,8 @@ struct nd_cmd_smart_threshold { · 2 unmodified lines
53} __packed;56} __packed;
54 57
55struct nd_smart_threshold_payload {58struct nd_smart_threshold_payload {
56 __u16 alarm_control;59 __u8 alarm_control;
60 __u8 reserved0;
57 __u16 temperature;61 __u16 temperature;
58 __u8 spares;62 __u8 spares;
59 __u8 reserved[3];63 __u8 reserved[3];