diff options
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/insmod.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c index 8a6cc05dd..c0bc0eb1b 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c | |||
| @@ -3613,12 +3613,12 @@ static int obj_gpl_license(struct obj_file *f, const char **license) | |||
| 3613 | * linux/include/linux/module.h. Checking for leading "GPL" will not | 3613 | * linux/include/linux/module.h. Checking for leading "GPL" will not |
| 3614 | * work, somebody will use "GPL sucks, this is proprietary". | 3614 | * work, somebody will use "GPL sucks, this is proprietary". |
| 3615 | */ | 3615 | */ |
| 3616 | static const char * const gpl_licenses[] = { | 3616 | static const char *const gpl_licenses[] = { |
| 3617 | "GPL", | 3617 | "GPL", |
| 3618 | "GPL v2", | 3618 | "GPL v2", |
| 3619 | "GPL and additional rights", | 3619 | "GPL and additional rights", |
| 3620 | "Dual BSD/GPL", | 3620 | "Dual BSD/GPL", |
| 3621 | "Dual MPL/GPL", | 3621 | "Dual MPL/GPL" |
| 3622 | }; | 3622 | }; |
| 3623 | 3623 | ||
| 3624 | sec = obj_find_section(f, ".modinfo"); | 3624 | sec = obj_find_section(f, ".modinfo"); |
| @@ -3681,7 +3681,8 @@ static void set_tainted(struct obj_file *f, int fd, char *m_name, | |||
| 3681 | /* Check if loading this module will taint the kernel. */ | 3681 | /* Check if loading this module will taint the kernel. */ |
| 3682 | static void check_tainted_module(struct obj_file *f, char *m_name) | 3682 | static void check_tainted_module(struct obj_file *f, char *m_name) |
| 3683 | { | 3683 | { |
| 3684 | static const char tainted_file[] = TAINT_FILENAME; | 3684 | static const char tainted_file[] ALIGN1 = TAINT_FILENAME; |
| 3685 | |||
| 3685 | int fd, kernel_has_tainted; | 3686 | int fd, kernel_has_tainted; |
| 3686 | const char *ptr; | 3687 | const char *ptr; |
| 3687 | 3688 | ||
| @@ -3750,7 +3751,8 @@ static void | |||
| 3750 | add_ksymoops_symbols(struct obj_file *f, const char *filename, | 3751 | add_ksymoops_symbols(struct obj_file *f, const char *filename, |
| 3751 | const char *m_name) | 3752 | const char *m_name) |
| 3752 | { | 3753 | { |
| 3753 | static const char symprefix[] = "__insmod_"; | 3754 | static const char symprefix[] ALIGN1 = "__insmod_"; |
| 3755 | |||
| 3754 | struct obj_section *sec; | 3756 | struct obj_section *sec; |
| 3755 | struct obj_symbol *sym; | 3757 | struct obj_symbol *sym; |
| 3756 | char *name, *absolute_filename; | 3758 | char *name, *absolute_filename; |
