diff options
| author | Vasily Gorbik <gor@linux.ibm.com> | 2022-03-01 23:02:48 +0300 |
|---|---|---|
| committer | Vasily Gorbik <gor@linux.ibm.com> | 2022-03-01 23:02:48 +0300 |
| commit | 9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040 (patch) | |
| tree | 7766b8d6ce6edc309ddba6c9740a782bfe8d2192 /arch/s390/lib | |
| parent | f413f685c6c094a7b968f66ca2e8512720807203 (diff) | |
| parent | c194dad21025dfd043210912653baab823bdff67 (diff) | |
| download | linux-9a4f03ad6d67b63e7d2a3fe16c30511f5fb80040.tar.xz | |
Merge branch 'fixes' into features
This helps to avoid several merge conflicts later.
* fixes:
s390/extable: fix exception table sorting
s390/ftrace: fix arch_ftrace_get_regs implementation
s390/ftrace: fix ftrace_caller/ftrace_regs_caller generation
s390/setup: preserve memory at OLDMEM_BASE and OLDMEM_SIZE
s390/cio: verify the driver availability for path_event call
s390/module: fix building test_modules_helpers.o with clang
MAINTAINERS: downgrade myself to Reviewer for s390
MAINTAINERS: add Alexander Gordeev as maintainer for s390
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Diffstat (limited to 'arch/s390/lib')
| -rw-r--r-- | arch/s390/lib/test_modules.c | 3 | ||||
| -rw-r--r-- | arch/s390/lib/test_modules.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/lib/test_modules.c b/arch/s390/lib/test_modules.c index d056baa8fbb0..9894009fc1f2 100644 --- a/arch/s390/lib/test_modules.c +++ b/arch/s390/lib/test_modules.c @@ -5,9 +5,6 @@ #include "test_modules.h" -#define DECLARE_RETURN(i) int test_modules_return_ ## i(void) -REPEAT_10000(DECLARE_RETURN); - /* * Test that modules with many relocations are loaded properly. */ diff --git a/arch/s390/lib/test_modules.h b/arch/s390/lib/test_modules.h index 43b5e4b4af3e..6371fcf17684 100644 --- a/arch/s390/lib/test_modules.h +++ b/arch/s390/lib/test_modules.h @@ -47,4 +47,7 @@ __REPEAT_10000_1(f, 8); \ __REPEAT_10000_1(f, 9) +#define DECLARE_RETURN(i) int test_modules_return_ ## i(void) +REPEAT_10000(DECLARE_RETURN); + #endif |