Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S269005AbTGJGy4 (ORCPT ); Thu, 10 Jul 2003 02:54:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S269008AbTGJGy4 (ORCPT ); Thu, 10 Jul 2003 02:54:56 -0400 Received: from holomorphy.com ([66.224.33.161]:59823 "EHLO holomorphy") by vger.kernel.org with ESMTP id S269005AbTGJGyy (ORCPT ); Thu, 10 Jul 2003 02:54:54 -0400 Date: Thu, 10 Jul 2003 00:10:35 -0700 From: William Lee Irwin III To: Piet Delaney , Andrew Morton , Thomas Schlichter , linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: Re: 2.5.74-mm3 - apm_save_cpus() Macro still bombs out Message-ID: <20030710071035.GR15452@holomorphy.com> Mail-Followup-To: William Lee Irwin III , Piet Delaney , Andrew Morton , Thomas Schlichter , linux-kernel@vger.kernel.org, linux-mm@kvack.org References: <20030708223548.791247f5.akpm@osdl.org> <200307091106.00781.schlicht@uni-mannheim.de> <20030709021849.31eb3aec.akpm@osdl.org> <1057815890.22772.19.camel@www.piet.net> <20030710060841.GQ15452@holomorphy.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20030710060841.GQ15452@holomorphy.com> Organization: The Domain of Holomorphy User-Agent: Mutt/1.5.4i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1353 Lines: 30 On Wed, Jul 09, 2003 at 10:44:50PM -0700, Piet Delaney wrote: >> I'll settle for Matt Mackall fix for now: >> +#define apm_save_cpus() (current->cpus_allowed) >> I wonder why other, like Thomas Schlichter , >> had no problem with the CPU_MASK_NONE fix. >> I tried adding the #include that Marc-Christian >> Petersen sugested but it didn't help. Looks >> like Jan De Luyck had a similar result. On Wed, Jul 09, 2003 at 11:08:41PM -0700, William Lee Irwin III wrote: > Ugh. Fixing. diff -prauN mm3-2.5.74-1/arch/i386/kernel/apm.c mm3-2.5.74-apm-1/arch/i386/kernel/apm.c --- mm3-2.5.74-1/arch/i386/kernel/apm.c 2003-07-09 00:03:25.000000000 -0700 +++ mm3-2.5.74-apm-1/arch/i386/kernel/apm.c 2003-07-10 00:03:31.000000000 -0700 @@ -528,7 +528,7 @@ static inline void apm_restore_cpus(cpum * No CPU lockdown needed on a uniprocessor */ -#define apm_save_cpus() 0 +#define apm_save_cpus() ({ cpumask_t __mask__ = CPU_MASK_NONE; __mask__; }) #define apm_restore_cpus(x) (void)(x) #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/