This converts i386/kernel/apm.c to cpumask_t (applies also to mm2)
Thanks,
Jan
--- linux-mm/arch/i386/kernel/apm.c Thu Jul 3 14:49:29 2003
+++ 2.5.74-mm1/arch/i386/kernel/apm.c Sat Jul 5 23:52:59 2003
@@ -508,16 +508,16 @@
#ifdef CONFIG_SMP
-static unsigned long apm_save_cpus(void)
+static cpumask_t apm_save_cpus(void)
{
- unsigned long x = current->cpus_allowed;
+ cpumask_t x = current->cpus_allowed;
/* Some bioses don't like being called from CPU != 0 */
- set_cpus_allowed(current, 1UL << 0);
+ set_cpus_allowed(current, cpumask_of_cpu(0));
BUG_ON(smp_processor_id() != 0);
return x;
}
-static inline void apm_restore_cpus(unsigned long mask)
+static inline void apm_restore_cpus(cpumask_t mask)
{
set_cpus_allowed(current, mask);
}
@@ -593,7 +593,7 @@
{
APM_DECL_SEGS
unsigned long flags;
- unsigned long cpus;
+ cpumask_t cpus;
int cpu;
struct desc_struct save_desc_40;
@@ -635,7 +635,7 @@
u8 error;
APM_DECL_SEGS
unsigned long flags;
- unsigned long cpus;
+ cpumask_t cpus;
int cpu;
struct desc_struct save_desc_40;
@@ -913,7 +913,7 @@
*/
#ifdef CONFIG_SMP
/* Some bioses don't like being called from CPU != 0 */
- set_cpus_allowed(current, 1UL << 0);
+ set_cpus_allowed(current, cpumask_of_cpu(0));
BUG_ON(smp_processor_id() != 0);
#endif
if (apm_info.realmode_power_off)
@@ -1704,7 +1704,7 @@
* Some bioses don't like being called from CPU != 0.
* Method suggested by Ingo Molnar.
*/
- set_cpus_allowed(current, 1UL << 0);
+ set_cpus_allowed(current, cpumask_of_cpu(0));
BUG_ON(smp_processor_id() != 0);
#endif
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Mon Jul 07 2003 - 22:00:25 EST