From 5835ea4d66f6b1935df29c6b0115a464b2b7a9a1 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Mon, 13 Sep 2004 17:43:55 -0700 Subject: [PATCH] [PATCH] ppc64: Fix spurious warnings uncovered by -Wno-uninitialized removal Here are fixes for some false positives. Signed-off-by: Anton Blanchard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/ppc64/kernel/iommu.c | 2 +- arch/ppc64/kernel/nvram.c | 2 +- arch/ppc64/kernel/pSeries_pci.c | 2 +- arch/ppc64/kernel/rtasd.c | 2 +- arch/ppc64/kernel/setup.c | 2 +- arch/ppc64/kernel/signal.c | 2 +- arch/ppc64/kernel/signal32.c | 2 +- arch/ppc64/kernel/sysfs.c | 13 +++++++------ arch/ppc64/oprofile/op_model_rs64.c | 4 ++-- arch/ppc64/xmon/xmon.c | 2 +- drivers/char/hvsi.c | 2 +- drivers/macintosh/via-pmu.c | 2 +- 12 files changed, 19 insertions(+), 18 deletions(-) diff --git a/arch/ppc64/kernel/iommu.c b/arch/ppc64/kernel/iommu.c index 5cac0d2400cea..d5d64d1d72584 100644 --- a/arch/ppc64/kernel/iommu.c +++ b/arch/ppc64/kernel/iommu.c @@ -229,7 +229,7 @@ int iommu_map_sg(struct device *dev, struct iommu_table *tbl, struct scatterlist *sglist, int nelems, enum dma_data_direction direction) { - dma_addr_t dma_next, dma_addr; + dma_addr_t dma_next = 0, dma_addr; unsigned long flags; struct scatterlist *s, *outs, *segstart; int outcount; diff --git a/arch/ppc64/kernel/nvram.c b/arch/ppc64/kernel/nvram.c index 89d6a0ad74f4d..f11a1d4159dc6 100644 --- a/arch/ppc64/kernel/nvram.c +++ b/arch/ppc64/kernel/nvram.c @@ -340,7 +340,7 @@ static int nvram_create_os_partition(void) struct list_head * p; struct nvram_partition * part; struct nvram_partition * new_part = NULL; - struct nvram_partition * free_part; + struct nvram_partition * free_part = NULL; int seq_init[2] = { 0, 0 }; loff_t tmp_index; long size = 0; diff --git a/arch/ppc64/kernel/pSeries_pci.c b/arch/ppc64/kernel/pSeries_pci.c index 3d08423501fbb..6a8f6257b1c3d 100644 --- a/arch/ppc64/kernel/pSeries_pci.c +++ b/arch/ppc64/kernel/pSeries_pci.c @@ -497,7 +497,7 @@ unsigned long __init find_and_init_phbs(void) struct pci_controller *phb; unsigned int root_size_cells = 0; unsigned int index; - unsigned int *opprop; + unsigned int *opprop = NULL; struct device_node *root = of_find_node_by_path("/"); if (naca->interrupt_controller == IC_OPEN_PIC) { diff --git a/arch/ppc64/kernel/rtasd.c b/arch/ppc64/kernel/rtasd.c index 85192f09c57a8..c6370a8e30bd0 100644 --- a/arch/ppc64/kernel/rtasd.c +++ b/arch/ppc64/kernel/rtasd.c @@ -106,7 +106,7 @@ static char *rtas_event_type(int type) static void printk_log_rtas(char *buf, int len) { - int i,j,n; + int i,j,n = 0; int perline = 16; char buffer[64]; char * str = "RTAS event"; diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c index e84f42a750ef3..e5e24d859a127 100644 --- a/arch/ppc64/kernel/setup.c +++ b/arch/ppc64/kernel/setup.c @@ -598,7 +598,7 @@ static int __init set_preferred_console(void) { struct device_node *prom_stdout; char *name; - int offset; + int offset = 0; /* The user has requested a console so this is already set up. */ if (strstr(saved_command_line, "console=")) diff --git a/arch/ppc64/kernel/signal.c b/arch/ppc64/kernel/signal.c index 63bac5fbd0816..d7ebd887006df 100644 --- a/arch/ppc64/kernel/signal.c +++ b/arch/ppc64/kernel/signal.c @@ -178,7 +178,7 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig, elf_vrreg_t __user *v_regs; #endif unsigned long err = 0; - unsigned long save_r13; + unsigned long save_r13 = 0; elf_greg_t *gregs = (elf_greg_t *)regs; int i; diff --git a/arch/ppc64/kernel/signal32.c b/arch/ppc64/kernel/signal32.c index 2a165163df053..3a9d9004f35f0 100644 --- a/arch/ppc64/kernel/signal32.c +++ b/arch/ppc64/kernel/signal32.c @@ -189,7 +189,7 @@ static long restore_user_regs(struct pt_regs *regs, elf_greg_t64 *gregs = (elf_greg_t64 *)regs; int i; long err = 0; - unsigned int save_r2; + unsigned int save_r2 = 0; #ifdef CONFIG_ALTIVEC unsigned long msr; #endif diff --git a/arch/ppc64/kernel/sysfs.c b/arch/ppc64/kernel/sysfs.c index f6ef0071c704a..f4e121c1ccd47 100644 --- a/arch/ppc64/kernel/sysfs.c +++ b/arch/ppc64/kernel/sysfs.c @@ -97,6 +97,13 @@ __setup("smt-snooze-delay=", setup_smt_snooze_delay); /* PMC stuff */ +#ifdef CONFIG_PPC_ISERIES +void ppc64_enable_pmcs(void) +{ + /* XXX Implement for iseries */ +} +#else + /* * Enabling PMCs will slow partition context switch times so we only do * it the first time we write to the PMCs. @@ -104,12 +111,6 @@ __setup("smt-snooze-delay=", setup_smt_snooze_delay); static DEFINE_PER_CPU(char, pmcs_enabled); -#ifdef CONFIG_PPC_ISERIES -void ppc64_enable_pmcs(void) -{ - /* XXX Implement for iseries */ -} -#else void ppc64_enable_pmcs(void) { unsigned long hid0; diff --git a/arch/ppc64/oprofile/op_model_rs64.c b/arch/ppc64/oprofile/op_model_rs64.c index 514aec8286993..251fdef4384a0 100644 --- a/arch/ppc64/oprofile/op_model_rs64.c +++ b/arch/ppc64/oprofile/op_model_rs64.c @@ -21,8 +21,8 @@ static void ctrl_write(unsigned int i, unsigned int val) { - unsigned int tmp; - unsigned long shift, mask; + unsigned int tmp = 0; + unsigned long shift = 0, mask = 0; dbg("ctrl_write %d %x\n", i, val); diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c index d84ac32fa3b8c..e438cf4cdbfe6 100644 --- a/arch/ppc64/xmon/xmon.c +++ b/arch/ppc64/xmon/xmon.c @@ -2059,7 +2059,7 @@ ppc_inst_dump(unsigned long adr, long count, int praddr) { int nr, dotted; unsigned long first_adr; - unsigned long inst, last_inst; + unsigned long inst, last_inst = 0; unsigned char val[4]; dotted = 0; diff --git a/drivers/char/hvsi.c b/drivers/char/hvsi.c index 16f32156e3788..595079c07be54 100644 --- a/drivers/char/hvsi.c +++ b/drivers/char/hvsi.c @@ -1004,7 +1004,7 @@ static int hvsi_write(struct tty_struct *tty, int from_user, { struct hvsi_struct *hp = tty->driver_data; const char *source = buf; - char *kbuf; + char *kbuf = NULL; unsigned long flags; int total = 0; int origcount = count; diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 1babc0f87bc2b..db0c0a726cfac 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -1446,7 +1446,7 @@ static struct adb_request* __pmac pmu_sr_intr(struct pt_regs *regs) { struct adb_request *req; - int bite; + int bite = 0; if (via[B] & TREQ) { printk(KERN_ERR "PMU: spurious SR intr (%x)\n", via[B]); -- 2.53.0