Merge branch 'omap-clock-fixes' of git://git.pwsan.com/linux-2.6

[linux-2.6-omap-h63xx.git] / mm / allocpercpu.c

diff --git a/mm/allocpercpu.c b/mm/allocpercpu.c
index 3653c570232bc5fd643a6c9cdccf4c05360525c7..dfdee6a47359eb9f529733091b6553091a80eebc 100644 (file)
--- a/mm/allocpercpu.c
+++ b/mm/allocpercpu.c
@@ -31,7 +31,7 @@ static void percpu_depopulate(void *__pdata, int cpu)
  * @__pdata: per-cpu data to depopulate
  * @mask: depopulate per-cpu data for cpu's selected through mask bits
  */
-static void __percpu_depopulate_mask(void *__pdata, cpumask_t *mask)
+static void __percpu_depopulate_mask(void *__pdata, const cpumask_t *mask)
 {
        int cpu;
        for_each_cpu_mask_nr(cpu, *mask)
@@ -120,7 +120,7 @@ void *__alloc_percpu(size_t size, size_t align)
         * on it.  Larger alignment should only be used for module
         * percpu sections on SMP for which this path isn't used.
         */
-       WARN_ON_ONCE(align > __alignof__(unsigned long long));
+       WARN_ON_ONCE(align > SMP_CACHE_BYTES);
 
        if (unlikely(!pdata))
                return NULL;
@@ -143,7 +143,7 @@ void free_percpu(void *__pdata)
 {
        if (unlikely(!__pdata))
                return;
-       __percpu_depopulate_mask(__pdata, &cpu_possible_map);
+       __percpu_depopulate_mask(__pdata, cpu_possible_mask);
        kfree(__percpu_disguise(__pdata));
 }
 EXPORT_SYMBOL_GPL(free_percpu);