[PATCH] ia64: fix PSR bug in perfmon code and switch to C99 initializers

Please apply this small patch to your 2.5.59.
It fixes the psr problem reported by the NEC guy and also cleans
up the structure intializations in the model specific files.

arch/ia64/kernel/perfmon.c

@@ -3972,6 +3972,11 @@ pfm_inherit(struct task_struct *task, struct pt_regs *regs)
 
 	sema_init(&nctx->ctx_restart_sem, 0); /* reset this semaphore to locked */
 
+	/*
+	 * propagate kernel psr in new context (used for first ctxsw in
+	 */
+	nctx->ctx_saved_psr = pfm_get_psr();
+
 	/* link with new task */
 	thread->pfm_context = nctx;
 
@@ -4268,8 +4273,8 @@ pfm_cleanup_notifiers(struct task_struct *task)
 
 static struct irqaction perfmon_irqaction = {
 	.handler =	pfm_interrupt_handler,
-	.flags =	SA_INTERRUPT,
-	.name =		"perfmon"
+	.flags   =	SA_INTERRUPT,
+	.name    =	"perfmon"
 };
 
 int

arch/ia64/kernel/perfmon_generic.h

@@ -39,10 +39,10 @@ static pfm_reg_desc_t pmd_gen_desc[PMU_MAX_PMDS]={
  * impl_pmcs, impl_pmds are computed at runtime to minimize errors!
  */
 static pmu_config_t pmu_conf={
-	disabled:	1,
-	ovfl_val:	(1UL << 32) - 1,
-	num_ibrs:	8,
-	num_dbrs:	8,
-	pmd_desc:	pfm_gen_pmd_desc,
-	pmc_desc:	pfm_gen_pmc_desc
+	.disabled = 1,
+	.ovfl_val = (1UL << 32) - 1,
+	.num_ibrs = 8,
+	.num_dbrs = 8,
+	.pmd_desc = pfm_gen_pmd_desc,
+	.pmc_desc = pfm_gen_pmc_desc
 };

arch/ia64/kernel/perfmon_itanium.h

@@ -59,12 +59,12 @@ static pfm_reg_desc_t pfm_ita_pmd_desc[PMU_MAX_PMDS]={
  * impl_pmcs, impl_pmds are computed at runtime to minimize errors!
  */
 static pmu_config_t pmu_conf={
-	disabled:	1,
-	ovfl_val:	(1UL << 32) - 1,
-	num_ibrs:	8,
-	num_dbrs:	8,
-	pmd_desc:	pfm_ita_pmd_desc,
-	pmc_desc:	pfm_ita_pmc_desc
+	.disabled = 1,
+	.ovfl_val = (1UL << 32) - 1,
+	.num_ibrs = 8,
+	.num_dbrs = 8,
+	.pmd_desc = pfm_ita_pmd_desc,
+	.pmc_desc = pfm_ita_pmc_desc
 };
 
 

arch/ia64/kernel/perfmon_mckinley.h

@@ -62,12 +62,12 @@ static pfm_reg_desc_t pfm_mck_pmd_desc[PMU_MAX_PMDS]={
  * impl_pmcs, impl_pmds are computed at runtime to minimize errors!
  */
 static pmu_config_t pmu_conf={
-	disabled:	1,
-	ovfl_val:	(1UL << 47) - 1,
-	num_ibrs:	8,
-	num_dbrs:	8,
-	pmd_desc:	pfm_mck_pmd_desc,
-	pmc_desc:	pfm_mck_pmc_desc
+	.disabled = 1,
+	.ovfl_val = (1UL << 47) - 1,
+	.num_ibrs = 8,
+	.num_dbrs = 8,
+	.pmd_desc = pfm_mck_pmd_desc,
+	.pmc_desc = pfm_mck_pmc_desc
 };