Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S265848AbTGIJKA (ORCPT ); Wed, 9 Jul 2003 05:10:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265882AbTGIJKA (ORCPT ); Wed, 9 Jul 2003 05:10:00 -0400 Received: from waste.org ([209.173.204.2]:57278 "EHLO waste.org") by vger.kernel.org with ESMTP id S265848AbTGIJJ7 (ORCPT ); Wed, 9 Jul 2003 05:09:59 -0400 Date: Wed, 9 Jul 2003 04:24:33 -0500 From: Matt Mackall To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: 2.5.74-mm3 Message-ID: <20030709092433.GA27280@waste.org> References: <20030708223548.791247f5.akpm@osdl.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030708223548.791247f5.akpm@osdl.org> User-Agent: Mutt/1.3.28i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1250 Lines: 41 On Tue, Jul 08, 2003 at 10:35:48PM -0700, Andrew Morton wrote: > Merged > > -cpumask_t-1.patch > -gcc-bug-workaround.patch > -sparse-apic-fix.patch > -nuke-cpumask_arith.patch > -p4-clockmod-cpumask-fix.patch > > Folded into cpumask_t-1.patch > > +cpumask_t-s390-fix.patch > +kgdb-cpumask_t.patch > +cpumask_t-x86_64-fix.patch > +sparc64-cpumask_t-fix.patch > > cpumask_t fixes UP APM has broken since -mm2, looks like something like this is needed (compiles, untested): diff -urN -x genksyms -x '*.ver' -x '.patch*' -x '*.orig' orig/arch/i386/kernel/apm.c patched/arch/i386/kernel/apm.c --- orig/arch/i386/kernel/apm.c 2003-07-09 04:07:06.000000000 -0500 +++ patched/arch/i386/kernel/apm.c 2003-07-09 04:19:52.000000000 -0500 @@ -528,7 +528,7 @@ * No CPU lockdown needed on a uniprocessor */ -#define apm_save_cpus() 0 +#define apm_save_cpus() (current->cpus_allowed) #define apm_restore_cpus(x) (void)(x) #endif -- Matt Mackall : http://www.selenic.com : of or relating to the moon - 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/