diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
| commit | 48c7d73b2362ce61503551ad70052617b3e8857d (patch) | |
| tree | 6b5ca29fb7964d29128a8d476317c27a61462e52 /arch/nios2/include/asm/shmparam.h | |
| parent | 88447c5b93d98be847f428c39ba589779a59eb83 (diff) | |
| parent | 975a6166a8584ee4a1b8bd93098e49dc101d7171 (diff) | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull another handful of EFI fixes for v5.2 from Arnd:
- Fix a potential crash after kexec on arm64 with GICv3
- Fix a build warning on x86
- Stop policing the BGRT feature flags
- Use a non-blocking version of SetVariable() in the boot control driver
Diffstat (limited to 'arch/nios2/include/asm/shmparam.h')
| -rw-r--r-- | arch/nios2/include/asm/shmparam.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/arch/nios2/include/asm/shmparam.h b/arch/nios2/include/asm/shmparam.h index 60784294e407..4288844eed46 100644 --- a/arch/nios2/include/asm/shmparam.h +++ b/arch/nios2/include/asm/shmparam.h @@ -1,17 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright Altera Corporation (C) <2015>. All rights reserved - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see <http://www.gnu.org/licenses/>. */ #ifndef _ASM_NIOS2_SHMPARAM_H #define _ASM_NIOS2_SHMPARAM_H |