diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/acct.c | 2 | ||||
| -rw-r--r-- | kernel/audit.c | 17 | ||||
| -rw-r--r-- | kernel/capability.c | 4 | ||||
| -rw-r--r-- | kernel/fork.c | 36 | ||||
| -rw-r--r-- | kernel/intermodule.c | 3 | ||||
| -rw-r--r-- | kernel/power/main.c | 2 | ||||
| -rw-r--r-- | kernel/power/pm.c | 2 | ||||
| -rw-r--r-- | kernel/power/smp.c | 2 | ||||
| -rw-r--r-- | kernel/resource.c | 2 | ||||
| -rw-r--r-- | kernel/signal.c | 2 | ||||
| -rw-r--r-- | kernel/sys.c | 4 | ||||
| -rw-r--r-- | kernel/timer.c | 4 |
12 files changed, 40 insertions, 40 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index 78ed87b13de6..035669624b6c 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -170,7 +170,7 @@ out: * * NOTE: acct_globals.lock MUST be held on entry and exit. */ -void acct_file_reopen(struct file *file) +static void acct_file_reopen(struct file *file) { struct file *old_acct = NULL; diff --git a/kernel/audit.c b/kernel/audit.c index 9e9471002eae..0f84dd7af2c8 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -155,6 +155,9 @@ struct audit_entry { struct audit_rule rule; }; +static void audit_log_end_irq(struct audit_buffer *ab); +static void audit_log_end_fast(struct audit_buffer *ab); + static void audit_panic(const char *message) { switch (audit_failure) @@ -236,7 +239,7 @@ void audit_log_lost(const char *message) } -int audit_set_rate_limit(int limit) +static int audit_set_rate_limit(int limit) { int old = audit_rate_limit; audit_rate_limit = limit; @@ -245,7 +248,7 @@ int audit_set_rate_limit(int limit) return old; } -int audit_set_backlog_limit(int limit) +static int audit_set_backlog_limit(int limit) { int old = audit_backlog_limit; audit_backlog_limit = limit; @@ -254,7 +257,7 @@ int audit_set_backlog_limit(int limit) return old; } -int audit_set_enabled(int state) +static int audit_set_enabled(int state) { int old = audit_enabled; if (state != 0 && state != 1) @@ -265,7 +268,7 @@ int audit_set_enabled(int state) return old; } -int audit_set_failure(int state) +static int audit_set_failure(int state) { int old = audit_failure; if (state != AUDIT_FAIL_SILENT @@ -547,7 +550,7 @@ static inline int audit_log_drain(struct audit_buffer *ab) } /* Initialize audit support at boot time. */ -int __init audit_init(void) +static int __init audit_init(void) { printk(KERN_INFO "audit: initializing netlink socket (%s)\n", audit_default ? "enabled" : "disabled"); @@ -768,7 +771,7 @@ static DECLARE_TASKLET(audit_tasklet, audit_tasklet_handler, 0); * the audit buffer is places on a queue and a tasklet is scheduled to * remove them from the queue outside the irq context. May be called in * any context. */ -void audit_log_end_irq(struct audit_buffer *ab) +static void audit_log_end_irq(struct audit_buffer *ab) { unsigned long flags; @@ -783,7 +786,7 @@ void audit_log_end_irq(struct audit_buffer *ab) /* Send the message in the audit buffer directly to user space. May not * be called in an irq context. */ -void audit_log_end_fast(struct audit_buffer *ab) +static void audit_log_end_fast(struct audit_buffer *ab) { unsigned long flags; diff --git a/kernel/capability.c b/kernel/capability.c index b828d545a97b..64db1ee820c2 100644 --- a/kernel/capability.c +++ b/kernel/capability.c @@ -20,10 +20,10 @@ EXPORT_SYMBOL(securebits); EXPORT_SYMBOL(cap_bset); /* - * This global lock protects task->cap_* for all tasks including current. + * This lock protects task->cap_* for all tasks including current. * Locking rule: acquire this prior to tasklist_lock. */ -DEFINE_SPINLOCK(task_capability_lock); +static DEFINE_SPINLOCK(task_capability_lock); /* * For sys_getproccap() and sys_setproccap(), any of the three diff --git a/kernel/fork.c b/kernel/fork.c index 19a56e20f3c1..5b67b3ebf3c0 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -80,6 +80,24 @@ int nr_processes(void) static kmem_cache_t *task_struct_cachep; #endif +/* SLAB cache for signal_struct structures (tsk->signal) */ +kmem_cache_t *signal_cachep; + +/* SLAB cache for sighand_struct structures (tsk->sighand) */ +kmem_cache_t *sighand_cachep; + +/* SLAB cache for files_struct structures (tsk->files) */ +kmem_cache_t *files_cachep; + +/* SLAB cache for fs_struct structures (tsk->fs) */ +kmem_cache_t *fs_cachep; + +/* SLAB cache for vm_area_struct structures */ +kmem_cache_t *vm_area_cachep; + +/* SLAB cache for mm_struct structures (tsk->mm) */ +static kmem_cache_t *mm_cachep; + void free_task(struct task_struct *tsk) { free_thread_info(tsk->thread_info); @@ -1233,24 +1251,6 @@ long do_fork(unsigned long clone_flags, return pid; } -/* SLAB cache for signal_struct structures (tsk->signal) */ -kmem_cache_t *signal_cachep; - -/* SLAB cache for sighand_struct structures (tsk->sighand) */ -kmem_cache_t *sighand_cachep; - -/* SLAB cache for files_struct structures (tsk->files) */ -kmem_cache_t *files_cachep; - -/* SLAB cache for fs_struct structures (tsk->fs) */ -kmem_cache_t *fs_cachep; - -/* SLAB cache for vm_area_struct structures */ -kmem_cache_t *vm_area_cachep; - -/* SLAB cache for mm_struct structures (tsk->mm) */ -kmem_cache_t *mm_cachep; - void __init proc_caches_init(void) { sighand_cachep = kmem_cache_create("sighand_cache", diff --git a/kernel/intermodule.c b/kernel/intermodule.c index 9078649382cf..388977f3e9b7 100644 --- a/kernel/intermodule.c +++ b/kernel/intermodule.c @@ -113,7 +113,7 @@ void inter_module_unregister(const char *im_name) * Try to increment the use count on the owning module, if that fails * then return NULL. Otherwise return the userdata. */ -const void *inter_module_get(const char *im_name) +static const void *inter_module_get(const char *im_name) { struct list_head *tmp; struct inter_module_entry *ime; @@ -178,6 +178,5 @@ void inter_module_put(const char *im_name) EXPORT_SYMBOL(inter_module_register); EXPORT_SYMBOL(inter_module_unregister); -EXPORT_SYMBOL(inter_module_get); EXPORT_SYMBOL(inter_module_get_request); EXPORT_SYMBOL(inter_module_put); diff --git a/kernel/power/main.c b/kernel/power/main.c index 0f78207cfb57..b0315cbad9b9 100644 --- a/kernel/power/main.c +++ b/kernel/power/main.c @@ -115,7 +115,7 @@ static void suspend_finish(suspend_state_t state) -char * pm_states[] = { +static char * pm_states[] = { [PM_SUSPEND_STANDBY] = "standby", [PM_SUSPEND_MEM] = "mem", [PM_SUSPEND_DISK] = "disk", diff --git a/kernel/power/pm.c b/kernel/power/pm.c index 8fca5822a807..61deda04e39e 100644 --- a/kernel/power/pm.c +++ b/kernel/power/pm.c @@ -151,7 +151,7 @@ void pm_unregister_all(pm_callback callback) * execution and unload yourself. */ -int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data) +static int pm_send(struct pm_dev *dev, pm_request_t rqst, void *data) { int status = 0; unsigned long prev_state, next_state; diff --git a/kernel/power/smp.c b/kernel/power/smp.c index cda77cdfb8c1..7fa7f6e2b7fb 100644 --- a/kernel/power/smp.c +++ b/kernel/power/smp.c @@ -42,7 +42,7 @@ static void smp_pause(void * data) __restore_processor_state(&ctxt); } -cpumask_t oldmask; +static cpumask_t oldmask; void disable_nonboot_cpus(void) { diff --git a/kernel/resource.c b/kernel/resource.c index 72596bc6fdaf..35c99ac02c7c 100644 --- a/kernel/resource.c +++ b/kernel/resource.c @@ -91,7 +91,7 @@ static int r_show(struct seq_file *m, void *v) return 0; } -struct seq_operations resource_op = { +static struct seq_operations resource_op = { .start = r_start, .next = r_next, .stop = r_stop, diff --git a/kernel/signal.c b/kernel/signal.c index 05c65254be47..b7657aecdc12 100644 --- a/kernel/signal.c +++ b/kernel/signal.c @@ -28,8 +28,6 @@ #include <asm/unistd.h> #include <asm/siginfo.h> -extern void k_getrusage(struct task_struct *, int, struct rusage *); - /* * SLAB caches for signal bits. */ diff --git a/kernel/sys.c b/kernel/sys.c index 51f8f3a183f2..462d78d55895 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -90,7 +90,7 @@ int cad_pid = 1; */ static struct notifier_block *reboot_notifier_list; -DEFINE_RWLOCK(notifier_lock); +static DEFINE_RWLOCK(notifier_lock); /** * notifier_chain_register - Add notifier to a notifier chain @@ -1540,7 +1540,7 @@ asmlinkage long sys_setrlimit(unsigned int resource, struct rlimit __user *rlim) * given child after it's reaped, or none so this sample is before reaping. */ -void k_getrusage(struct task_struct *p, int who, struct rusage *r) +static void k_getrusage(struct task_struct *p, int who, struct rusage *r) { struct task_struct *t; unsigned long flags; diff --git a/kernel/timer.c b/kernel/timer.c index 167f5b9e65bd..ecb3d67c0e14 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -589,10 +589,10 @@ long time_tolerance = MAXFREQ; /* frequency tolerance (ppm) */ long time_precision = 1; /* clock precision (us) */ long time_maxerror = NTP_PHASE_LIMIT; /* maximum error (us) */ long time_esterror = NTP_PHASE_LIMIT; /* estimated error (us) */ -long time_phase; /* phase offset (scaled us) */ +static long time_phase; /* phase offset (scaled us) */ long time_freq = (((NSEC_PER_SEC + HZ/2) % HZ - HZ/2) << SHIFT_USEC) / NSEC_PER_USEC; /* frequency offset (scaled ppm)*/ -long time_adj; /* tick adjust (scaled 1 / HZ) */ +static long time_adj; /* tick adjust (scaled 1 / HZ) */ long time_reftime; /* time at last adjustment (s) */ long time_adjust; long time_next_adjust; |