mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/kernel: unify EX_TABLE* implementations

Browse Source 
Replace three implementations with one using using __stringify_in_c
macro conveniently "borrowed" from powerpc and microblaze.

Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
This commit is contained in:
Ilya Leoshkevich
2020-06-29 20:48:09 +02:00
committed by Heiko Carstens
parent 771cf196cc
commit 88aa8939c9
2 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/s390/include/asm/asm-const.h Normal file
View File

@@ -0,0 +1,12 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _ASM_S390_ASM_CONST_H
#define _ASM_S390_ASM_CONST_H
#ifdef __ASSEMBLY__
# define stringify_in_c(...) __VA_ARGS__
#else
/* This version of stringify will deal with commas... */
# define __stringify_in_c(...) #__VA_ARGS__
# define stringify_in_c(...) __stringify_in_c(__VA_ARGS__) " "
#endif
#endif /* _ASM_S390_ASM_CONST_H */

34
arch/s390/include/asm/linkage.h
View File

@@ -2,38 +2,26 @@
#ifndef __ASM_LINKAGE_H #ifndef __ASM_LINKAGE_H
#define __ASM_LINKAGE_H #define __ASM_LINKAGE_H
#include <asm/asm-const.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#define __ALIGN .align 4, 0x07 #define __ALIGN .align 4, 0x07
#define __ALIGN_STR __stringify(__ALIGN) #define __ALIGN_STR __stringify(__ALIGN)
#ifndef __ASSEMBLY__
/* /*
* Helper macro for exception table entries * Helper macro for exception table entries
*/ */
#define EX_TABLE(_fault, _target) \
".section __ex_table,\"a\"\n" \
".align 4\n" \
".long (" #_fault ") - .\n" \
".long (" #_target ") - .\n" \
".previous\n"
#else /* __ASSEMBLY__ */ #define __EX_TABLE(_section, _fault, _target) \
stringify_in_c(.section _section,"a";) \
stringify_in_c(.align 4;) \
stringify_in_c(.long (_fault) - .;) \
stringify_in_c(.long (_target) - .;) \
stringify_in_c(.previous)
#define EX_TABLE(_fault, _target) \ #define EX_TABLE(_fault, _target) \
.section __ex_table,"a" ; \ __EX_TABLE(__ex_table, _fault, _target)
.align 4 ; \ #define EX_TABLE_DMA(_fault, _target) \
.long (_fault) - . ; \ __EX_TABLE(.dma.ex_table, _fault, _target)
.long (_target) - . ; \
.previous
#define EX_TABLE_DMA(_fault, _target) \
.section .dma.ex_table, "a" ; \
.align 4 ; \
.long (_fault) - . ; \
.long (_target) - . ; \
.previous
#endif /* __ASSEMBLY__ */
#endif #endif