diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-26 12:47:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-05-26 12:47:07 +0100 |
| commit | 03c7f5f0b844e9f652e87daf5c51bb93ccf75296 (patch) | |
| tree | 140ab988587f2909b890b30c689669aa2a4ad82d /include | |
| parent | 3866f217aaa81bf7165c7f27362eee5d7919c496 (diff) | |
| parent | fb597f2a393294f3d3012ecb314f43b60fa48359 (diff) | |
Merge branches 'fixes' and 'misc' into for-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/moduleloader.h | 5 | ||||
| -rw-r--r-- | include/media/cec-notifier.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index ca92aea8a6bd..4fa67a8b2265 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -29,6 +29,11 @@ void *module_alloc(unsigned long size); /* Free memory returned from module_alloc. */ void module_memfree(void *module_region); +/* Determines if the section name is an init section (that is only used during + * module loading). + */ +bool module_init_section(const char *name); + /* Determines if the section name is an exit section (that is only used during * module unloading) */ diff --git a/include/media/cec-notifier.h b/include/media/cec-notifier.h index 38956969fd12..b1c839734124 100644 --- a/include/media/cec-notifier.h +++ b/include/media/cec-notifier.h @@ -2,7 +2,7 @@ /* * cec-notifier.h - notify CEC drivers of physical address changes * - * Copyright 2016 Russell King <rmk+kernel@arm.linux.org.uk> + * Copyright 2016 Russell King. * Copyright 2016-2017 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ |