target/linux/pxa/patches-2.6.21/022-bugfix-pxa-cpufreq.patch

   1 --- a/arch/arm/mach-pxa/cpu-pxa.c
   2 +++ b/arch/arm/mach-pxa/cpu-pxa.c
   3 @@ -60,7 +60,7 @@ typedef struct
   4
   5  /* Define the refresh period in mSec for the SDRAM and the number of rows */
   6  #define SDRAM_TREF          64      /* standard 64ms SDRAM */
   7 -#define SDRAM_ROWS          4096    /* 64MB=8192 32MB=4096 */
   8 +#define SDRAM_ROWS          8192    /* 64MB=8192 32MB=4096 */
   9  #define MDREFR_DRI(x)       ((x*SDRAM_TREF)/(SDRAM_ROWS*32))
  10
  11  #define CCLKCFG_TURBO       0x1
  12 @@ -136,7 +136,7 @@ static int pxa_set_target(struct cpufreq
  13                   unsigned int relation)
  14  {
  15      int idx;
  16 -    unsigned long cpus_allowed;
  17 +    cpumask_t cpus_allowed;
  18      int cpu = policy->cpu;
  19      struct cpufreq_freqs freqs;
  20      pxa_freqs_t *pxa_freq_settings;
  21 @@ -144,6 +144,7 @@ static int pxa_set_target(struct cpufreq
  22      unsigned long flags;
  23      unsigned int unused;
  24      unsigned int preset_mdrefr, postset_mdrefr;
  25 +    void *ramstart;
  26
  27      /*
  28       * Save this threads cpus_allowed mask.
  29 @@ -154,7 +155,7 @@ static int pxa_set_target(struct cpufreq
  30       * Bind to the specified CPU.  When this call returns,
  31       * we should be running on the right CPU.
  32       */
  33 -    set_cpus_allowed(current, 1 << cpu);
  34 +    set_cpus_allowed(current, cpumask_of_cpu(cpu));
  35      BUG_ON(cpu != smp_processor_id());
  36
  37      /* Get the current policy */
  38 @@ -187,7 +188,7 @@ static int pxa_set_target(struct cpufreq
  39              (pxa_freq_settings[idx].membus/1000));
  40      }
  41
  42 -    void *ramstart = phys_to_virt(0xa0000000);
  43 +    ramstart = phys_to_virt(0xa0000000);
  44
  45      /*
  46       * Tell everyone what we're about to do...
  47 @@ -260,13 +261,13 @@ static int pxa_set_target(struct cpufreq
  48
  49  static int pxa_cpufreq_init(struct cpufreq_policy *policy)
  50  {
  51 -    unsigned long cpus_allowed;
  52 +    cpumask_t cpus_allowed;
  53      unsigned int cpu = policy->cpu;
  54      int i;
  55
  56         cpus_allowed = current->cpus_allowed;
  57
  58 -       set_cpus_allowed(current, 1 << cpu);
  59 +       set_cpus_allowed(current, cpumask_of_cpu(cpu));
  60         BUG_ON(cpu != smp_processor_id());
  61
  62      /* set default policy and cpuinfo */