diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:55:59 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2019-03-05 15:55:59 +0100 |
| commit | 67bae14adc8cdb650b042319136b74cffbad23c8 (patch) | |
| tree | 550db9602f14f9aeeb6ab2f842c7e4491bf1c3cb /samples/livepatch/livepatch-shadow-fix1.c | |
| parent | selftests/livepatch: add DYNAMIC_DEBUG config dependency (diff) | |
| parent | livepatch: samples: non static warnings fix (diff) | |
| download | linux-67bae14adc8cdb650b042319136b74cffbad23c8.tar.xz linux-67bae14adc8cdb650b042319136b74cffbad23c8.zip | |
Merge branch 'for-5.0/upstream-fixes' into for-linus
Document change towards group maintainership of livepatching code
samples/ warning fix from Nicholas Mc Guire
Diffstat (limited to 'samples/livepatch/livepatch-shadow-fix1.c')
| -rw-r--r-- | samples/livepatch/livepatch-shadow-fix1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/samples/livepatch/livepatch-shadow-fix1.c b/samples/livepatch/livepatch-shadow-fix1.c index a5a5cac21d4d..67a73e5e986e 100644 --- a/samples/livepatch/livepatch-shadow-fix1.c +++ b/samples/livepatch/livepatch-shadow-fix1.c @@ -71,7 +71,7 @@ static int shadow_leak_ctor(void *obj, void *shadow_data, void *ctor_data) return 0; } -struct dummy *livepatch_fix1_dummy_alloc(void) +static struct dummy *livepatch_fix1_dummy_alloc(void) { struct dummy *d; void *leak; @@ -113,7 +113,7 @@ static void livepatch_fix1_dummy_leak_dtor(void *obj, void *shadow_data) __func__, d, *shadow_leak); } -void livepatch_fix1_dummy_free(struct dummy *d) +static void livepatch_fix1_dummy_free(struct dummy *d) { void **shadow_leak; |