Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58580c86 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 60860710 fadfd2b6

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -2851,7 +2851,9 @@ S: Maintained 


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

arch/ia64/kernel/esi.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static int __init esi_init (void) 
	}



	if (!esi)

		return -ENODEV;;

		return -ENODEV;



	systab = __va(esi);

arch/ia64/kernel/perfmon.c

+1 −1
Original line number Diff line number Diff line
@@ -5603,7 +5603,7 @@ pfm_interrupt_handler(int irq, void *arg) 
 * /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)

arch/ia64/kernel/salinfo.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ struct salinfo_platform_oemdata_parms { 
static void

salinfo_work_to_do(struct salinfo_data *data)

{

	down_trylock(&data->mutex);

	(void)(down_trylock(&data->mutex) ?: 0);

	up(&data->mutex);

}

arch/ia64/kvm/process.c

+3 −3
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ static void collect_interruption(struct kvm_vcpu *vcpu) 
	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 @@ static void set_pal_call_data(struct kvm_vcpu *vcpu) 
		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;