diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:07:19 -0700 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2016-05-18 10:07:19 -0700 |
| commit | 1b982baf75e7d9585967fcfccd05b77bf9054010 (patch) | |
| tree | d997a2b60ea7eee0c6a17eb82cd4e7a0e3b09749 /drivers/acpi/nfit.h | |
| parent | 1f716d05f8daee4f393dc568ea7a53c7ecfd0bfc (diff) | |
| parent | 6ca7208569550de43d64db6cf873706c371284a5 (diff) | |
| download | op-kernel-dev-1b982baf75e7d9585967fcfccd05b77bf9054010.zip op-kernel-dev-1b982baf75e7d9585967fcfccd05b77bf9054010.tar.gz | |
Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next
Diffstat (limited to 'drivers/acpi/nfit.h')
| -rw-r--r-- | drivers/acpi/nfit.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/acpi/nfit.h b/drivers/acpi/nfit.h index 46c50148..11cb383 100644 --- a/drivers/acpi/nfit.h +++ b/drivers/acpi/nfit.h @@ -52,11 +52,13 @@ enum nfit_uuids { NFIT_UUID_MAX, }; -enum nfit_fic { - NFIT_FIC_BYTE = 0x101, /* byte-addressable energy backed */ - NFIT_FIC_BLK = 0x201, /* block-addressable non-energy backed */ - NFIT_FIC_BYTEN = 0x301, /* byte-addressable non-energy backed */ -}; +/* + * Region format interface codes are stored as an array of bytes in the + * NFIT DIMM Control Region structure + */ +#define NFIT_FIC_BYTE cpu_to_be16(0x101) /* byte-addressable energy backed */ +#define NFIT_FIC_BLK cpu_to_be16(0x201) /* block-addressable non-energy backed */ +#define NFIT_FIC_BYTEN cpu_to_be16(0x301) /* byte-addressable non-energy backed */ enum { NFIT_BLK_READ_FLUSH = 1, |
