constifications
Subsystems (9)
PATCH 1/1 constifications
- completely constify string arrays, thus move them to the rodata section
- audit.c: mark some initially initialized variables __read_mostly
Signed-off-by Helge Deller <[email protected]>
include/linux/relay.h | 2 +- kernel/audit.c | 8 ++++---- kernel/configs.c | 2 +- kernel/cpuset.c | 4 ++-- kernel/dma.c | 2 +- kernel/futex.c | 2 +- kernel/kallsyms.c | 2 +- kernel/lockdep_proc.c | 4 ++-- kernel/profile.c | 2 +- kernel/relay.c | 2 +- kernel/resource.c | 4 ++-- kernel/sched.c | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-)
include/linux/relay.h +1 -1
@@ -274,7 +274,7 @@ static inline void subbuf_start_reserve(/* * exported relay file operations, kernel/relay.c */ -extern struct file_operations relay_file_operations; +extern const struct file_operations relay_file_operations;#endif /* _LINUX_RELAY_H */
kernel/audit.c +4 -4
@@ -62,13 +62,13 @@/* No auditing will take place until audit_initialized != 0. * (Initialization happens after skb_init is called.) */ -static int audit_initialized; +static int audit_initialized__read_mostly ;/* No syscall auditing will take place unless audit_enabled != 0. */ -int audit_enabled; +int audit_enabled__read_mostly ;/* Default state when kernel boots without any parameters. */ -static int audit_default; +static int audit_default__read_mostly ;/* If auditing cannot proceed, audit_failure selects what happens. */ static int audit_failure =AUDIT_FAIL_PRINTK ;
@@ -1027,7 +1027,7 @@ void audit_log_hex(struct audit_buffer *int i, avail, new_len;unsigned char *ptr;struct sk_buff *skb; -static const unsigned char *hex ="0123456789ABCDEF" ; +static const unsigned char hex[] ="0123456789ABCDEF" ;if (!ab)return ;
kernel/configs.c +1 -1
@@ -75,7 +75,7 @@ ikconfig_read_current(struct file *file,return count; } -static struct file_operations ikconfig_file_ops = { +static const struct file_operations ikconfig_file_ops = { .owner =THIS_MODULE , .read = ikconfig_read_current, };
kernel/cpuset.c +2 -2
@@ -1532,7 +1532,7 @@ static int cpuset_rename(struct inode *oreturn simple_rename (old_dir, old_dentry, new_dir, new_dentry); } -static struct file_operations cpuset_file_operations = { +static const struct file_operations cpuset_file_operations = { .read = cpuset_file_read, .write = cpuset_file_write, .llseek = generic_file_llseek,
@@ -2610,7 +2610,7 @@ static int cpuset_open(struct inode *inoreturn single_open (file, proc_cpuset_show, pid); } -struct file_operations proc_cpuset_operations = { +const struct file_operations proc_cpuset_operations = { .open = cpuset_open, .read = seq_read, .llseek = seq_lseek,
kernel/dma.c +1 -1
@@ -140,7 +140,7 @@ static int proc_dma_open(struct inode *ireturn single_open (file, proc_dma_show,NULL ); } -static struct file_operations proc_dma_operations = { +static const struct file_operations proc_dma_operations = { .open = proc_dma_open, .read = seq_read, .llseek = seq_lseek,
kernel/futex.c +1 -1
@@ -1493,7 +1493,7 @@ static unsigned int futex_poll(struct fireturn ret; } -static struct file_operations futex_fops = { +static const struct file_operations futex_fops = { .release = futex_close, .poll = futex_poll, };
kernel/kallsyms.c +1 -1
@@ -436,7 +436,7 @@ static int kallsyms_release(struct inodereturn seq_release (inode, file); } -static struct file_operations kallsyms_operations = { +static const struct file_operations kallsyms_operations = { .open = kallsyms_open, .read = seq_read, .llseek = seq_lseek,
kernel/lockdep_proc.c +2 -2
@@ -135,7 +135,7 @@ static int lockdep_open(struct inode *inreturn res; } -static struct file_operations proc_lockdep_operations = { +static const struct file_operations proc_lockdep_operations = { .open = lockdep_open, .read = seq_read, .llseek = seq_lseek,
@@ -319,7 +319,7 @@ static int lockdep_stats_open(struct inoreturn single_open (file, lockdep_stats_show,NULL ); } -static struct file_operations proc_lockdep_stats_operations = { +static const struct file_operations proc_lockdep_stats_operations = { .open = lockdep_stats_open, .read = seq_read, .llseek = seq_lseek,
kernel/profile.c +1 -1
@@ -480,7 +480,7 @@ static ssize_t write_profile(struct filereturn count; } -static struct file_operations proc_profile_operations = { +static const struct file_operations proc_profile_operations = { .read = read_profile, .write = write_profile, };
kernel/relay.c +1 -1
@@ -1008,7 +1008,7 @@ static ssize_t relay_file_sendfile(struc actor, target); } -struct file_operations relay_file_operations = { +const struct file_operations relay_file_operations = { .open = relay_file_open, .poll = relay_file_poll, .mmap = relay_file_mmap,
kernel/resource.c +2 -2
@@ -115,14 +115,14 @@ static int iomem_open(struct inode *inodreturn res; } -static struct file_operations proc_ioports_operations = { +static const struct file_operations proc_ioports_operations = { .open = ioports_open, .read = seq_read, .llseek = seq_lseek, .release = seq_release, }; -static struct file_operations proc_iomem_operations = { +static const struct file_operations proc_iomem_operations = { .open = iomem_open, .read = seq_read, .llseek = seq_lseek,
kernel/sched.c +1 -1
@@ -505,7 +505,7 @@ static int schedstat_open(struct inode *return res; } -struct file_operations proc_schedstat_operations = { +const struct file_operations proc_schedstat_operations = { .open = schedstat_open, .read = seq_read, .llseek = seq_lseek,
Quoted 1 line · Helge Deller
[ Patch deleted ]
Sorry, last mail was the wrong patch for the mail subject. Here is the correct one:
[mm/ directory] constify some static string arrays and their pointers
Signed-off-by Helge Deller <[email protected]>
include/linux/mmzone.h | 2 +- mm/mempolicy.c | 4 ++-- mm/page_alloc.c | 2 +- mm/shmem.c | 4 ++-- mm/swapfile.c | 2 +- mm/vmstat.c | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-)
include/linux/mmzone.h +1 -1
@@ -282,7 +282,7 @@ struct zone {/* * rarely used fields: */ -char *name; +const char *name; }____cacheline_internodealigned_in_smp ;/*
mm/mempolicy.c +2 -2
@@ -1705,8 +1705,8 @@ void mpol_rebind_mm(struct mm_struct *mm* Display pages allocated per node and memory policy via /proc. */ -static const char *policy_types[] = {"default" ,"prefer" ,"bind" , -"interleave" }; +static const char *const policy_types[] = + {"default" ,"prefer" ,"bind" ,"interleave" };/* * Convert a mempolicy into a string.
mm/page_alloc.c +1 -1
@@ -89,7 +89,7 @@ EXPORT_SYMBOL(totalram_pages);struct zone *zone_table[1 <<ZONETABLE_SHIFT ]__read_mostly ;EXPORT_SYMBOL (zone_table); -static char *zone_names[MAX_NR_ZONES ] = { +static const char *const zone_names[MAX_NR_ZONES ] = {"DMA" , #ifdef CONFIG_ZONE_DMA32 "DMA32",
mm/shmem.c +2 -2
@@ -176,7 +176,7 @@ static inline void shmem_unacct_blocks(ustatic struct super_operations shmem_ops;static const struct address_space_operations shmem_aops; -static struct file_operations shmem_file_operations; +static const struct file_operations shmem_file_operations;static struct inode_operations shmem_inode_operations;static struct inode_operations shmem_dir_inode_operations;static struct inode_operations shmem_special_inode_operations;
@@ -2237,7 +2237,7 @@ static const struct address_space_operat .migratepage = migrate_page, }; -static struct file_operations shmem_file_operations = { +static const struct file_operations shmem_file_operations = { .mmap = shmem_mmap, #ifdef CONFIG_TMPFS .llseek = generic_file_llseek,
mm/swapfile.c +1 -1
@@ -1337,7 +1337,7 @@ static int swaps_open(struct inode *inodreturn seq_open (file, &swaps_op); } -static struct file_operations proc_swaps_operations = { +static const struct file_operations proc_swaps_operations = { .open = swaps_open, .read = seq_read, .llseek = seq_lseek,
mm/vmstat.c +1 -1
@@ -452,7 +452,7 @@ struct seq_operations fragmentation_op =#define TEXTS_FOR_ZONES (xx) xx "_dma", TEXT_FOR_DMA32(xx) xx "_normal", \ TEXT_FOR_HIGHMEM(xx) -static char *vmstat_text[] = { +static const char *const vmstat_text[] = {/* Zoned VM counters */ "nr_anon_pages" ,"nr_mapped" ,