diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-11-16 01:56:11 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-11-16 01:56:11 +0100 |
| commit | 4247f24c23589bcc3bc3490515ef8c9497e9ae55 (patch) | |
| tree | 89726a0e171c443a3e8def2992b56dbd8a21df21 /arch/parisc | |
| parent | acpi, nfit: add 'Enable Latch System Shutdown Status' command support (diff) | |
| parent | dax: fix general protection fault in dax_alloc_inode (diff) | |
| download | linux-4247f24c23589bcc3bc3490515ef8c9497e9ae55.tar.xz linux-4247f24c23589bcc3bc3490515ef8c9497e9ae55.zip | |
Merge branch 'for-4.15/dax' into libnvdimm-for-next
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/include/uapi/asm/mman.h | 1 | ||||
| -rw-r--r-- | arch/parisc/kernel/process.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index 775b5d5e41a1..bca652aa1677 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h @@ -11,6 +11,7 @@ #define MAP_SHARED 0x01 /* Share changes */ #define MAP_PRIVATE 0x02 /* Changes are private */ +#define MAP_SHARED_VALIDATE 0x03 /* share + validate extension flags */ #define MAP_TYPE 0x03 /* Mask for type of mapping */ #define MAP_FIXED 0x04 /* Interpret addr exactly */ #define MAP_ANONYMOUS 0x10 /* don't use a file */ diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c index a45a67d526f8..30f92391a93e 100644 --- a/arch/parisc/kernel/process.c +++ b/arch/parisc/kernel/process.c @@ -146,7 +146,7 @@ void machine_power_off(void) /* prevent soft lockup/stalled CPU messages for endless loop. */ rcu_sysrq_start(); - lockup_detector_suspend(); + lockup_detector_soft_poweroff(); for (;;); } |