Commit a7f215bb authored by Stéphane Eranian's avatar Stéphane Eranian Committed by David Mosberger

[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.
parent 466a43d5
...@@ -3972,6 +3972,11 @@ pfm_inherit(struct task_struct *task, struct pt_regs *regs) ...@@ -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 */ 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 */ /* link with new task */
thread->pfm_context = nctx; thread->pfm_context = nctx;
......
...@@ -39,10 +39,10 @@ static pfm_reg_desc_t pmd_gen_desc[PMU_MAX_PMDS]={ ...@@ -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! * impl_pmcs, impl_pmds are computed at runtime to minimize errors!
*/ */
static pmu_config_t pmu_conf={ static pmu_config_t pmu_conf={
disabled: 1, .disabled = 1,
ovfl_val: (1UL << 32) - 1, .ovfl_val = (1UL << 32) - 1,
num_ibrs: 8, .num_ibrs = 8,
num_dbrs: 8, .num_dbrs = 8,
pmd_desc: pfm_gen_pmd_desc, .pmd_desc = pfm_gen_pmd_desc,
pmc_desc: pfm_gen_pmc_desc .pmc_desc = pfm_gen_pmc_desc
}; };
...@@ -59,12 +59,12 @@ static pfm_reg_desc_t pfm_ita_pmd_desc[PMU_MAX_PMDS]={ ...@@ -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! * impl_pmcs, impl_pmds are computed at runtime to minimize errors!
*/ */
static pmu_config_t pmu_conf={ static pmu_config_t pmu_conf={
disabled: 1, .disabled = 1,
ovfl_val: (1UL << 32) - 1, .ovfl_val = (1UL << 32) - 1,
num_ibrs: 8, .num_ibrs = 8,
num_dbrs: 8, .num_dbrs = 8,
pmd_desc: pfm_ita_pmd_desc, .pmd_desc = pfm_ita_pmd_desc,
pmc_desc: pfm_ita_pmc_desc .pmc_desc = pfm_ita_pmc_desc
}; };
......
...@@ -62,12 +62,12 @@ static pfm_reg_desc_t pfm_mck_pmd_desc[PMU_MAX_PMDS]={ ...@@ -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! * impl_pmcs, impl_pmds are computed at runtime to minimize errors!
*/ */
static pmu_config_t pmu_conf={ static pmu_config_t pmu_conf={
disabled: 1, .disabled = 1,
ovfl_val: (1UL << 47) - 1, .ovfl_val = (1UL << 47) - 1,
num_ibrs: 8, .num_ibrs = 8,
num_dbrs: 8, .num_dbrs = 8,
pmd_desc: pfm_mck_pmd_desc, .pmd_desc = pfm_mck_pmd_desc,
pmc_desc: pfm_mck_pmc_desc .pmc_desc = pfm_mck_pmc_desc
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment