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
2121 } __packed;
2222
2323 #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)
24+#define ND_SMART_SPARES_VALID (1 << 1)
25+#define ND_SMART_USED_VALID (1 << 2)
26+#define ND_SMART_TEMP_VALID (1 << 3)
27+#define ND_SMART_CTEMP_VALID (1 << 4)
28+#define ND_SMART_ALARM_VALID (1 << 9)
29+#define ND_SMART_SHUTDOWN_VALID (1 << 10)
30+#define ND_SMART_VENDOR_VALID (1 << 11)
31+#define ND_SMART_SPARE_TRIP (1 << 0)
32+#define ND_SMART_TEMP_TRIP (1 << 1)
33+#define ND_SMART_CTEMP_TRIP (1 << 2)
3234 #define ND_SMART_NON_CRITICAL_HEALTH (1 << 0)
3335 #define ND_SMART_CRITICAL_HEALTH (1 << 1)
3436 #define ND_SMART_FATAL_HEALTH (1 << 2)
@@ -37,14 +39,15 @@ struct nd_smart_payload { · 2 unmodified lines
3739 __u32 flags;
3840 __u8 reserved0[4];
3941 __u8 health;
40− __u16 temperature;
4142 __u8 spares;
42− __u8 alarm_flags;
4343 __u8 life_used;
44+ __u8 alarm_flags;
45+ __u16 temperature;
46+ __u16 ctrl_temperature;
47+ __u8 reserved1[15];
4448 __u8 shutdown_state;
45− __u8 reserved1;
4649 __u32 vendor_size;
47− __u8 vendor_data[108];
50+ __u8 vendor_data[92];
4851 } __packed;
4952
5053 struct nd_cmd_smart_threshold {
@@ -53,7 +56,8 @@ struct nd_cmd_smart_threshold { · 2 unmodified lines
5356 } __packed;
5457
5558 struct nd_smart_threshold_payload {
56− __u16 alarm_control;
59+ __u8 alarm_control;
60+ __u8 reserved0;
5761 __u16 temperature;
5862 __u8 spares;
5963 __u8 reserved[3];