Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: Add Fenghua Yu as temporary co-maintainer for ia64 [IA64] address compiler warnings perfmon.c/salinfo.c [IA64] Remove unnecessary semicolons [IA64] sprintf should not be used with same source & destination address

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: Add Fenghua Yu as temporary co-maintainer for ia64 [IA64] address compiler warnings perfmon.c/salinfo.c [IA64] Remove unnecessary semicolons [IA64] sprintf should not be used with same source & destination address
Linus Torvalds
2 parents 6086071005 fadfd2b6ba
Showing 8 changed files Side-by-side Diff
MAINTAINERS
arch/ia64/kernel/esi.c
arch/ia64/kernel/perfmon.c
arch/ia64/kernel/salinfo.c
arch/ia64/kvm/process.c
arch/ia64/kvm/vcpu.c
arch/ia64/kvm/vtlb.c
arch/ia64/sn/kernel/io_common.c
@@ -2851,7 +2851,9 @@
  
 IA64 (Itanium) PLATFORM
 P:	Tony Luck
+P:	Fenghua Yu
 M:	tony.luck@intel.com
+M:	fenghua.yu@intel.com
 L:	linux-ia64@vger.kernel.org
 W:	http://www.ia64-linux.org/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
@@ -65,7 +65,7 @@
 	}
  
 	if (!esi)
-		return -ENODEV;;
+		return -ENODEV;
  
 	systab = __va(esi);
  
@@ -5603,7 +5603,7 @@
  * /proc/perfmon interface, for debug only
  */
  
-#define PFM_PROC_SHOW_HEADER	((void *)nr_cpu_ids+1)
+#define PFM_PROC_SHOW_HEADER	((void *)(long)nr_cpu_ids+1)
  
 static void *
 pfm_proc_start(struct seq_file *m, loff_t *pos)
@@ -192,7 +192,7 @@
 static void
 salinfo_work_to_do(struct salinfo_data *data)
 {
-	down_trylock(&data->mutex);
+	(void)(down_trylock(&data->mutex) ?: 0);
 	up(&data->mutex);
 }
  
@@ -130,7 +130,7 @@
 	if (vdcr & IA64_DCR_PP) {
 		vpsr |= IA64_PSR_PP;
 	} else {
-		vpsr &= ~IA64_PSR_PP;;
+		vpsr &= ~IA64_PSR_PP;
 	}
  
 	vcpu_set_psr(vcpu, vpsr);
  
@@ -594,11 +594,11 @@
 		p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
 		break;
 	case PAL_BRAND_INFO:
-		p->u.pal_data.gr29 = gr29;;
+		p->u.pal_data.gr29 = gr29;
 		p->u.pal_data.gr30 = kvm_trans_pal_call_args(vcpu, gr30);
 		break;
 	default:
-		p->u.pal_data.gr29 = gr29;;
+		p->u.pal_data.gr29 = gr29;
 		p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
 	}
 	p->u.pal_data.gr28 = gr28;
@@ -406,7 +406,7 @@
 	 * Now look at registers in [0-31] range and init correct UNAT
 	 */
 	addr = (unsigned long)regs;
-	unat = &regs->eml_unat;;
+	unat = &regs->eml_unat;
  
 	addr += gr_info[regnum];
  
@@ -135,7 +135,7 @@
 	u64 rid;
  
 	rid = vcpu_get_rr(vcpu, va);
-	rid = rid & RR_RID_MASK;;
+	rid = rid & RR_RID_MASK;
 	if (type == D_TLB) {
 		if (vcpu_quick_region_check(vcpu->arch.dtr_regions, va)) {
 			for (trp = (struct thash_data *)&vcpu->arch.dtrs, i = 0;
@@ -518,7 +518,7 @@
  
 	struct thash_cb *hcb = &v->arch.vtlb;
  
-	cch = __vtr_lookup(v, va, is_data);;
+	cch = __vtr_lookup(v, va, is_data);
 	if (cch)
 		return cch;
  
@@ -435,7 +435,8 @@
 	bricktype = MODULE_GET_BTYPE(moduleid);
 	if ((bricktype == L1_BRICKTYPE_191010) ||
 	    (bricktype == L1_BRICKTYPE_1932))
-			sprintf(address, "%s^%d", address, geo_slot(geoid));
+			sprintf(address + strlen(address), "^%d",
+						geo_slot(geoid));
 }
  
 void __devinit
...	...	@@ -2851,7 +2851,9 @@
2851	2851
2852	2852	IA64 (Itanium) PLATFORM
2853	2853	P: Tony Luck
	2854	+P: Fenghua Yu
2854	2855	M: tony.luck@intel.com
	2856	+M: fenghua.yu@intel.com
2855	2857	L: linux-ia64@vger.kernel.org
2856	2858	W: http://www.ia64-linux.org/
2857	2859	T: git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
...	...	@@ -65,7 +65,7 @@
65	65	}
66	66
67	67	if (!esi)
68		- return -ENODEV;;
	68	+ return -ENODEV;
69	69
70	70	systab = __va(esi);
71	71
...	...	@@ -5603,7 +5603,7 @@
5603	5603	* /proc/perfmon interface, for debug only
5604	5604	*/
5605	5605
5606		-#define PFM_PROC_SHOW_HEADER ((void *)nr_cpu_ids+1)
	5606	+#define PFM_PROC_SHOW_HEADER ((void *)(long)nr_cpu_ids+1)
5607	5607
5608	5608	static void *
5609	5609	pfm_proc_start(struct seq_file m, loff_t pos)
...	...	@@ -192,7 +192,7 @@
192	192	static void
193	193	salinfo_work_to_do(struct salinfo_data *data)
194	194	{
195		- down_trylock(&data->mutex);
	195	+ (void)(down_trylock(&data->mutex) ?: 0);
196	196	up(&data->mutex);
197	197	}
198	198
...	...	@@ -130,7 +130,7 @@
130	130	if (vdcr & IA64_DCR_PP) {
131	131	vpsr \|= IA64_PSR_PP;
132	132	} else {
133		- vpsr &= ~IA64_PSR_PP;;
	133	+ vpsr &= ~IA64_PSR_PP;
134	134	}
135	135
136	136	vcpu_set_psr(vcpu, vpsr);
137	137
...	...	@@ -594,11 +594,11 @@
594	594	p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
595	595	break;
596	596	case PAL_BRAND_INFO:
597		- p->u.pal_data.gr29 = gr29;;
	597	+ p->u.pal_data.gr29 = gr29;
598	598	p->u.pal_data.gr30 = kvm_trans_pal_call_args(vcpu, gr30);
599	599	break;
600	600	default:
601		- p->u.pal_data.gr29 = gr29;;
	601	+ p->u.pal_data.gr29 = gr29;
602	602	p->u.pal_data.gr30 = vcpu_get_gr(vcpu, 30);
603	603	}
604	604	p->u.pal_data.gr28 = gr28;
...	...	@@ -406,7 +406,7 @@
406	406	* Now look at registers in [0-31] range and init correct UNAT
407	407	*/
408	408	addr = (unsigned long)regs;
409		- unat = &regs->eml_unat;;
	409	+ unat = &regs->eml_unat;
410	410
411	411	addr += gr_info[regnum];
412	412
...	...	@@ -135,7 +135,7 @@
135	135	u64 rid;
136	136
137	137	rid = vcpu_get_rr(vcpu, va);
138		- rid = rid & RR_RID_MASK;;
	138	+ rid = rid & RR_RID_MASK;
139	139	if (type == D_TLB) {
140	140	if (vcpu_quick_region_check(vcpu->arch.dtr_regions, va)) {
141	141	for (trp = (struct thash_data *)&vcpu->arch.dtrs, i = 0;
...	...	@@ -518,7 +518,7 @@
518	518
519	519	struct thash_cb *hcb = &v->arch.vtlb;
520	520
521		- cch = __vtr_lookup(v, va, is_data);;
	521	+ cch = __vtr_lookup(v, va, is_data);
522	522	if (cch)
523	523	return cch;
524	524
...	...	@@ -435,7 +435,8 @@
435	435	bricktype = MODULE_GET_BTYPE(moduleid);
436	436	if ((bricktype == L1_BRICKTYPE_191010) \|\|
437	437	(bricktype == L1_BRICKTYPE_1932))
438		- sprintf(address, "%s^%d", address, geo_slot(geoid));
	438	+ sprintf(address + strlen(address), "^%d",
	439	+ geo_slot(geoid));
439	440	}
440	441
441	442	void __devinit