Merge with Linux 2.3.99-pre8. Linus must hate me, too man patches ;-)

8 files changed, 40 insertions, 44 deletions

diff --git a/kernel/acct.c b/kernel/acct.c
index 2bd7d121d..86d776c5b 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -68,9 +68,9 @@ int acct_parm[3] = {4, 2, 30};
  */
 void acct_timeout(unsigned long);
 
-static volatile int acct_active = 0;
-static volatile int acct_needcheck = 0;
-static struct file *acct_file = NULL;
+static volatile int acct_active;
+static volatile int acct_needcheck;
+static struct file *acct_file;
 static struct timer_list acct_timer = { NULL, NULL, 0, 0, acct_timeout };
 static int do_acct_process(long, struct file *);
 
diff --git a/kernel/fork.c b/kernel/fork.c
index 424b2ed55..aa350672a 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -25,12 +25,12 @@
 #include <asm/mmu_context.h>
 
 /* The idle threads do not count.. */
-int nr_threads=0;
-int nr_running=0;
+int nr_threads;
+int nr_running;
 
 int max_threads;
-unsigned long total_forks = 0;	/* Handle normal Linux uptimes. */
-int last_pid=0;
+unsigned long total_forks;	/* Handle normal Linux uptimes. */
+int last_pid;
 
 /* SLAB cache for mm_struct's. */
 kmem_cache_t *mm_cachep;
diff --git a/kernel/panic.c b/kernel/panic.c
index 8e53e13b4..8ea4fd0b6 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -21,7 +21,7 @@ asmlinkage void sys_sync(void);	/* it's really int */
 extern void unblank_console(void);
 extern int C_A_D;
 
-int panic_timeout = 0;
+int panic_timeout;
 
 struct notifier_block *panic_notifier_list = NULL;
 
diff --git a/kernel/pm.c b/kernel/pm.c
index 0f3984bea..eb7c6f615 100644
--- a/kernel/pm.c
+++ b/kernel/pm.c
@@ -23,7 +23,7 @@
 #include <linux/slab.h>
 #include <linux/pm.h>
 
-int pm_active = 0;
+int pm_active;
 
 static spinlock_t pm_devs_lock = SPIN_LOCK_UNLOCKED;
 static LIST_HEAD(pm_devs);
diff --git a/kernel/printk.c b/kernel/printk.c
index f1cf10cff..ca4b14ff9 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -34,11 +34,7 @@ static char buf[1024];
 #define MINIMUM_CONSOLE_LOGLEVEL 1 /* Minimum loglevel we let people use */
 #define DEFAULT_CONSOLE_LOGLEVEL 7 /* anything MORE serious than KERN_DEBUG */
 
-unsigned long log_size = 0;
-/* 2.3.47 triggers a linker bug which hits if for a relocation the addend
-   equals the offset and the relocation is against a global variable.  This
-   avoid it to hit us.  It's not a safe workaround of course.  */
-unsigned long silly_linker_bug = 0;
+unsigned long log_size;
 DECLARE_WAIT_QUEUE_HEAD(log_wait);
 
 /* Keep together for sysctl support */
@@ -51,8 +47,8 @@ spinlock_t console_lock = SPIN_LOCK_UNLOCKED;
 
 struct console *console_drivers = NULL;
 static char log_buf[LOG_BUF_LEN];
-static unsigned long log_start = 0;
-static unsigned long logged_chars = 0;
+static unsigned long log_start;
+static unsigned long logged_chars;
 struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
 static int preferred_console = -1;
 
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 5137a8e90..4dd683997 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -49,7 +49,7 @@ extern int nr_queued_signals, max_queued_signals;
 
 /* this is needed for the proc_dointvec_minmax for [fs_]overflow UID and GID */
 static int maxolduid = 65535;
-static int minolduid = 0;
+static int minolduid;
 
 #ifdef CONFIG_KMOD
 extern char modprobe_path[];
diff --git a/kernel/time.c b/kernel/time.c
index 3585e1cc8..843ac0cbb 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -202,20 +202,20 @@ asmlinkage long sys_settimeofday(struct timeval *tv, struct timezone *tz)
 	return do_sys_settimeofday(tv ? &new_tv : NULL, tz ? &new_tz : NULL);
 }
 
-long pps_offset = 0;		/* pps time offset (us) */
+long pps_offset;		/* pps time offset (us) */
 long pps_jitter = MAXTIME;	/* time dispersion (jitter) (us) */
 
-long pps_freq = 0;		/* frequency offset (scaled ppm) */
+long pps_freq;			/* frequency offset (scaled ppm) */
 long pps_stabil = MAXFREQ;	/* frequency dispersion (scaled ppm) */
 
 long pps_valid = PPS_VALID;	/* pps signal watchdog counter */
 
 int pps_shift = PPS_SHIFT;	/* interval duration (s) (shift) */
 
-long pps_jitcnt = 0;		/* jitter limit exceeded */
-long pps_calcnt = 0;		/* calibration intervals */
-long pps_errcnt = 0;		/* calibration errors */
-long pps_stbcnt = 0;		/* stability limit exceeded */
+long pps_jitcnt;		/* jitter limit exceeded */
+long pps_calcnt;		/* calibration intervals */
+long pps_errcnt;		/* calibration errors */
+long pps_stbcnt;		/* stability limit exceeded */
 
 /* hook for a loadable hardpps kernel module */
 void (*hardpps_ptr)(struct timeval *) = (void (*)(struct timeval *))0;
diff --git a/kernel/timer.c b/kernel/timer.c
index 1f2698dc3..9fa35a63b 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -47,30 +47,30 @@ DECLARE_TASK_QUEUE(tq_scheduler);
 /* TIME_ERROR prevents overwriting the CMOS clock */
 int time_state = TIME_OK;		/* clock synchronization status	*/
 int time_status = STA_UNSYNC;		/* clock status bits		*/
-long time_offset = 0;			/* time adjustment (us)		*/
+long time_offset;			/* time adjustment (us)		*/
 long time_constant = 2;			/* pll time constant		*/
 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 = 0;			/* phase offset (scaled us)	*/
+long time_phase;			/* phase offset (scaled us)	*/
 long time_freq = ((1000000 + HZ/2) % HZ - HZ/2) << SHIFT_USEC;
 					/* frequency offset (scaled ppm)*/
-long time_adj = 0;			/* tick adjust (scaled 1 / HZ)	*/
-long time_reftime = 0;			/* time at last adjustment (s)	*/
+long time_adj;				/* tick adjust (scaled 1 / HZ)	*/
+long time_reftime;			/* time at last adjustment (s)	*/
 
-long time_adjust = 0;
-long time_adjust_step = 0;
+long time_adjust;
+long time_adjust_step;
 
-unsigned long event = 0;
+unsigned long event;
 
 extern int do_setitimer(int, struct itimerval *, struct itimerval *);
 
-unsigned long volatile jiffies = 0;
+unsigned long volatile jiffies;
 
-unsigned int * prof_buffer = NULL;
-unsigned long prof_len = 0;
-unsigned long prof_shift = 0;
+unsigned int * prof_buffer;
+unsigned long prof_len;
+unsigned long prof_shift;
 
 /*
  * Event timer code
@@ -92,11 +92,11 @@ struct timer_vec_root {
 	struct list_head vec[TVR_SIZE];
 };
 
-static struct timer_vec tv5 = { 0 };
-static struct timer_vec tv4 = { 0 };
-static struct timer_vec tv3 = { 0 };
-static struct timer_vec tv2 = { 0 };
-static struct timer_vec_root tv1 = { 0 };
+static struct timer_vec tv5;
+static struct timer_vec tv4;
+static struct timer_vec tv3;
+static struct timer_vec tv2;
+static struct timer_vec_root tv1;
 
 static struct timer_vec * const tvecs[] = {
 	(struct timer_vec *)&tv1, &tv2, &tv3, &tv4, &tv5
@@ -118,7 +118,7 @@ void init_timervecs (void)
 		INIT_LIST_HEAD(tv1.vec + i);
 }
 
-static unsigned long timer_jiffies = 0;
+static unsigned long timer_jiffies;
 
 static inline void internal_add_timer(struct timer_list *timer)
 {
@@ -338,7 +338,7 @@ void immediate_bh(void)
 	run_task_queue(&tq_immediate);
 }
 
-unsigned long timer_active = 0;
+unsigned long timer_active;
 struct timer_struct timer_table[32];
 
 /*
@@ -625,7 +625,7 @@ static unsigned long count_active_tasks(void)
  * Nothing else seems to be standardized: the fractional size etc
  * all seem to differ on different machines.
  */
-unsigned long avenrun[3] = { 0,0,0 };
+unsigned long avenrun[3];
 
 static inline void calc_load(unsigned long ticks)
 {
@@ -642,8 +642,8 @@ static inline void calc_load(unsigned long ticks)
 	}
 }
 
-volatile unsigned long lost_ticks = 0;
-static unsigned long lost_ticks_system = 0;
+volatile unsigned long lost_ticks;
+static unsigned long lost_ticks_system;
 
 /*
  * This spinlock protect us from races in SMP while playing with xtime. -arca