diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-27 23:14:08 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-27 23:14:08 +0200 |
commit | f6248dd88dba3aeb19351410a027d92eee7ceb72 (patch) | |
tree | 9dfe33ca030186ffd5007784d0647a8306d41be9 /include/linux/proc_ns.h | |
parent | ACPI / PM / EC: Flush all EC work in acpi_freeze_sync() (diff) | |
parent | ACPI: NUMA: Fix typo in the full name of SRAT (diff) | |
download | linux-dev-f6248dd88dba3aeb19351410a027d92eee7ceb72.tar.xz linux-dev-f6248dd88dba3aeb19351410a027d92eee7ceb72.zip |
Merge branches 'acpi-pm' and 'acpi-numa'
* acpi-pm:
ACPI / PM / EC: Flush all EC work in acpi_freeze_sync()
ACPI / EC: Add parameter to force disable the GPE on suspend
* acpi-numa:
ACPI: NUMA: Fix typo in the full name of SRAT
ACPI: NUMA: add missing include in acpi_numa.h
Diffstat (limited to 'include/linux/proc_ns.h')
-rw-r--r-- | include/linux/proc_ns.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h index 58ab28d81fc2..06844b54dfc1 100644 --- a/include/linux/proc_ns.h +++ b/include/linux/proc_ns.h @@ -21,7 +21,7 @@ struct proc_ns_operations { int (*install)(struct nsproxy *nsproxy, struct ns_common *ns); struct user_namespace *(*owner)(struct ns_common *ns); struct ns_common *(*get_parent)(struct ns_common *ns); -}; +} __randomize_layout; extern const struct proc_ns_operations netns_operations; extern const struct proc_ns_operations utsns_operations; |