projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
acpi
/
nfit.h
diff --git
a/drivers/acpi/nfit.h
b/drivers/acpi/nfit.h
index 329a1eba0c164e79cac859c28afeab456755ca89..2ea5c0797c8f4575c090a34352ceba14d9a5af40 100644
(file)
--- a/
drivers/acpi/nfit.h
+++ b/
drivers/acpi/nfit.h
@@
-48,6
+48,7
@@
enum {
struct nfit_spa {
struct acpi_nfit_system_address *spa;
struct list_head list;
struct nfit_spa {
struct acpi_nfit_system_address *spa;
struct list_head list;
+ int is_registered;
};
struct nfit_dcr {
};
struct nfit_dcr {
@@
-97,6
+98,7
@@
struct acpi_nfit_desc {
struct nvdimm_bus_descriptor nd_desc;
struct acpi_table_nfit *nfit;
struct mutex spa_map_mutex;
struct nvdimm_bus_descriptor nd_desc;
struct acpi_table_nfit *nfit;
struct mutex spa_map_mutex;
+ struct mutex init_mutex;
struct list_head spa_maps;
struct list_head memdevs;
struct list_head flushes;
struct list_head spa_maps;
struct list_head memdevs;
struct list_head flushes;