diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 21:08:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-09 21:08:15 +0200 |
| commit | 593c75463ab6d6985cdc9916f3d1c28b5f6340cd (patch) | |
| tree | fead1a52de9609ccd841bc4caa3a2ea44ddff932 /arch/parisc/include/asm/psw.h | |
| parent | Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
| parent | parisc: asm: psw.h: missing header guard (diff) | |
| download | linux-593c75463ab6d6985cdc9916f3d1c28b5f6340cd.tar.xz linux-593c75463ab6d6985cdc9916f3d1c28b5f6340cd.zip | |
Merge branch 'parisc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull parisc updates from Helge Deller:
"Dynamic ftrace support by Sven Schnelle and a header guard fix by
Denis Efremov"
* 'parisc-5.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc: asm: psw.h: missing header guard
parisc: add dynamic ftrace
compiler.h: add CC_USING_PATCHABLE_FUNCTION_ENTRY
parisc: use pr_debug() in kernel/module.c
parisc: add WARN_ON() to clear_fixmap
parisc: add spinlock to patch function
parisc: add support for patching multiple words
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 |