From patchwork Wed Feb 25 03:59:29 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Magnus Damm X-Patchwork-Id: 8675 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1P41n4Y021281 for ; Wed, 25 Feb 2009 04:01:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752092AbZBYEBt (ORCPT ); Tue, 24 Feb 2009 23:01:49 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753449AbZBYEBt (ORCPT ); Tue, 24 Feb 2009 23:01:49 -0500 Received: from mail-gx0-f174.google.com ([209.85.217.174]:34883 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752092AbZBYEBs (ORCPT ); Tue, 24 Feb 2009 23:01:48 -0500 Received: by gxk22 with SMTP id 22so8081956gxk.13 for ; Tue, 24 Feb 2009 20:01:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:date:message-id :subject; bh=IEIRc7SnnN2/Wg+ehEJ4bNw7UWEMx9Bev3fimtIR8Zw=; b=iEIOV9amAPMUllN0fVOcLtmbHSfWPjE+DFvxmGEQo4JFxZ7bl0gC/DYWcCuV5NOJVX 5HdzlcHJgUShSFHB+f4xDnBrMpksrrLk+FsQlJImnTxqVZzmZO9Yxzr2hG5cxBDKCaO1 bxOatm2hQI7wZB7oYRGECOn6+pXsQABJ8htIg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:date:message-id:subject; b=kxS6h6e/97UmCly0HYRnLUB9/KJUiJSMHPTs5bnS3dfZN231ttLEkcIIt0v6Tc3eGQ jwPFIc1S4yMvGxXoHVWfaYMJaGB2W0fy1R2sUCq0DR1nl13iOP7p3y85GUA858ZI9EIY d0o40aHEaNQVF+FUv+v1VVsjd/r5PqF7suBTs= Received: by 10.151.12.1 with SMTP id p1mr418224ybi.136.1235534505875; Tue, 24 Feb 2009 20:01:45 -0800 (PST) Received: from rx1.opensource.se (114.8.221.202.ts.2iij.net [202.221.8.114]) by mx.google.com with ESMTPS id o27sm2025177ele.13.2009.02.24.20.01.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 24 Feb 2009 20:01:45 -0800 (PST) From: Magnus Damm To: linux-pm@lists.linux-foundation.org Cc: Magnus Damm , lethal@linux-sh.org, akpm@linux-foundation.org, linux-sh@vger.kernel.org Date: Wed, 25 Feb 2009 12:59:29 +0900 Message-Id: <20090225035929.18506.46282.sendpatchset@rx1.opensource.se> Subject: [PATCH] pm: rework includes, remove arch ifdefs V2 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org From: Magnus Damm This patch contains the following header file changes: - remove arch ifdefs and asm/suspend.h from linux/suspend.h - add asm/suspend.h to disk.c (for arch_prepare_suspend()) - add linux/io.h to swsusp.c (for ioremap()) - x86 32/64 bit compile fixes Signed-off-by: Magnus Damm --- These are the only generic changes needed to get CONFIG_HIBERNATION working on SuperH. Changes since V1: - x86 32/64 bit compile fixes, thanks akpm! arch/x86/kernel/asm-offsets_32.c | 1 + arch/x86/kernel/asm-offsets_64.c | 1 + arch/x86/power/cpu_32.c | 1 + arch/x86/power/cpu_64.c | 1 + arch/x86/power/hibernate_64.c | 1 + include/linux/suspend.h | 3 --- kernel/power/disk.c | 1 + kernel/power/swsusp.c | 1 + 8 files changed, 7 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 0001/arch/x86/kernel/asm-offsets_32.c +++ work/arch/x86/kernel/asm-offsets_32.c 2009-02-25 12:20:52.000000000 +0900 @@ -18,6 +18,7 @@ #include #include #include +#include #include --- 0001/arch/x86/kernel/asm-offsets_64.c +++ work/arch/x86/kernel/asm-offsets_64.c 2009-02-25 12:20:52.000000000 +0900 @@ -17,6 +17,7 @@ #include #include #include +#include #include --- 0001/arch/x86/power/cpu_32.c +++ work/arch/x86/power/cpu_32.c 2009-02-25 12:20:52.000000000 +0900 @@ -12,6 +12,7 @@ #include #include #include +#include static struct saved_context saved_context; --- 0001/arch/x86/power/cpu_64.c +++ work/arch/x86/power/cpu_64.c 2009-02-25 12:20:52.000000000 +0900 @@ -15,6 +15,7 @@ #include #include #include +#include static void fix_processor_context(void); --- 0001/arch/x86/power/hibernate_64.c +++ work/arch/x86/power/hibernate_64.c 2009-02-25 12:20:52.000000000 +0900 @@ -14,6 +14,7 @@ #include #include #include +#include /* References to section boundaries */ extern const void __nosave_begin, __nosave_end; --- 0001/include/linux/suspend.h +++ work/include/linux/suspend.h 2009-02-24 15:03:52.000000000 +0900 @@ -1,9 +1,6 @@ #ifndef _LINUX_SUSPEND_H #define _LINUX_SUSPEND_H -#if defined(CONFIG_X86) || defined(CONFIG_FRV) || defined(CONFIG_PPC32) || defined(CONFIG_PPC64) -#include -#endif #include #include #include --- 0001/kernel/power/disk.c +++ work/kernel/power/disk.c 2009-02-24 15:03:52.000000000 +0900 @@ -22,6 +22,7 @@ #include #include #include +#include #include "power.h" --- 0001/kernel/power/swsusp.c +++ work/kernel/power/swsusp.c 2009-02-24 15:03:52.000000000 +0900 @@ -51,6 +51,7 @@ #include #include #include +#include #include "power.h"