diff options
| author | Linus Torvalds | 2018-04-05 14:21:13 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-05 14:21:13 -0700 |
| commit | dd972f924df6bdbc0ab185a38d5d2361dbc26311 (patch) | |
| tree | 181c24478ae55284f7baee88c3cf794794467aa2 /include/acpi | |
| parent | 3c8ba0d61d04ced9f8d9ff93977995a9e4e96e91 (diff) | |
| parent | 6fd052665274b4e7570491ba272f2dbb09cbbcd5 (diff) | |
Merge tag 'edac_for_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull EDAC updates from Borislav Petkov:
"Noteworthy is the NVDIMM support:
- NVDIMM support to EDAC (Tony Luck)
- misc fixes"
* tag 'edac_for_4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
EDAC, sb_edac: Remove variable length array usage
EDAC, skx_edac: Detect non-volatile DIMMs
firmware, DMI: Add function to look up a handle and return DIMM size
acpi, nfit: Add function to look up nvdimm device and provide SMBIOS handle
EDAC: Add new memory type for non-volatile DIMMs
EDAC: Drop duplicated array of strings for memory type names
EDAC, layerscape: Allow building for LS1021A
Diffstat (limited to 'include/acpi')
| -rw-r--r-- | include/acpi/nfit.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/acpi/nfit.h b/include/acpi/nfit.h new file mode 100644 index 000000000000..86ed07c1200d --- /dev/null +++ b/include/acpi/nfit.h @@ -0,0 +1,18 @@ +/* + * SPDX-License-Identifier: GPL-2.0 + * Copyright (C) 2018 Intel Corporation + */ + +#ifndef __ACPI_NFIT_H +#define __ACPI_NFIT_H + +#if IS_ENABLED(CONFIG_ACPI_NFIT) +int nfit_get_smbios_id(u32 device_handle, u16 *flags); +#else +static inline int nfit_get_smbios_id(u32 device_handle, u16 *flags) +{ + return -EOPNOTSUPP; +} +#endif + +#endif /* __ACPI_NFIT_H */ |