diff options
| author | Thomas Gleixner | 2019-07-28 22:22:40 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2019-07-28 22:22:40 +0200 |
| commit | 7a30bdd99f37352b188575b27924c407c6ddff9e (patch) | |
| tree | 10ea40ab1b5211e75c33eaddb3a6b393ad6ee7ad /arch/parisc/include/asm/psw.h | |
| parent | x86/speculation/swapgs: Exclude ATOMs from speculation through SWAPGS (diff) | |
| parent | Linux 5.3-rc2 (diff) | |
| download | kernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.gz kernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.tar.xz kernel-qcow2-linux-7a30bdd99f37352b188575b27924c407c6ddff9e.zip | |
Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Pick up the spectre documentation so the Grand Schemozzle can be added.
Diffstat (limited to 'arch/parisc/include/asm/psw.h')
| -rw-r--r-- | arch/parisc/include/asm/psw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/psw.h b/arch/parisc/include/asm/psw.h index 76c301146c31..46921ffcc407 100644 --- a/arch/parisc/include/asm/psw.h +++ b/arch/parisc/include/asm/psw.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ #ifndef _PARISC_PSW_H - +#define _PARISC_PSW_H #define PSW_I 0x00000001 #define PSW_D 0x00000002 |