public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: Linux PM List <linux-pm@lists.linux-foundation.org>
Cc: Sergio Luis <sergio@larces.uece.br>,
	Lauro Salmito <laurosalmito@gmail.com>,
	Greg Kroah-Hartman <gregkh@suse.de>,
	Heiko Carstens <heiko.carstens@de.ibm.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Magnus Damm <damm@igel.co.jp>, Ingo Molnar <mingo@elte.hu>,
	Wu Fengguang <fengguang.wu@intel.com>,
	Jaswinder Singh Rajput <jaswinder@kernel.org>
Subject: [PATCH 02/19] x86: unify power/cpu_(32|64) headers
Date: Thu, 11 Jun 2009 22:29:53 +0000 (UTC)
Date: Thu Jun 11 23:25:58 CEST 2009	[thread overview]
Message-ID: <S4AoGnG.A.xE.8UYMKB@chimera> (raw)
In-Reply-To: <0615007ad8090a890586d530b5d3bb98da566014.1244752872.git.rjw@sisk.pl>

From: Sergio Luis <sergio@larces.uece.br>

First step towards the unification of cpu_32.c and cpu_64.c.
This commit unifies the headers of such files, making both
of them use the same header files. It also remove the uneeded
<module.h>.

Signed-off-by: Sergio Luis <sergio@larces.uece.br>
Signed-off-by: Lauro Salmito <laurosalmito@gmail.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
 arch/x86/power/cpu_32.c |    6 +++++-
 arch/x86/power/cpu_64.c |    8 +++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/arch/x86/power/cpu_32.c b/arch/x86/power/cpu_32.c
index ce702c5..12a9c87 100644
--- a/arch/x86/power/cpu_32.c
+++ b/arch/x86/power/cpu_32.c
@@ -7,9 +7,13 @@
  * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
  */
 
-#include <linux/module.h>
 #include <linux/suspend.h>
+#include <linux/smp.h>
+
+#include <asm/pgtable.h>
+#include <asm/proto.h>
 #include <asm/mtrr.h>
+#include <asm/page.h>
 #include <asm/mce.h>
 #include <asm/xcr.h>
 #include <asm/suspend.h>
diff --git a/arch/x86/power/cpu_64.c b/arch/x86/power/cpu_64.c
index 5343540..39b27b7 100644
--- a/arch/x86/power/cpu_64.c
+++ b/arch/x86/power/cpu_64.c
@@ -8,12 +8,14 @@
  * Copyright (c) 2001 Patrick Mochel <mochel@osdl.org>
  */
 
-#include <linux/smp.h>
 #include <linux/suspend.h>
-#include <asm/proto.h>
-#include <asm/page.h>
+#include <linux/smp.h>
+
 #include <asm/pgtable.h>
+#include <asm/proto.h>
 #include <asm/mtrr.h>
+#include <asm/page.h>
+#include <asm/mce.h>
 #include <asm/xcr.h>
 #include <asm/suspend.h>
 
-- 
1.5.2.4

  parent reply	other threads:[~2009-06-11 22:29 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-11 21:42 [PATCH 00/19] What's in the suspend tree for 2.6.31 Rafael J. Wysocki
2009-06-11 21:42 ` [PATCH 01/19] PM: Warn if interrupts are enabled during suspend-resume of sysdevs Rafael J. Wysocki
2009-06-12 10:37   ` Pavel Machek
2009-06-12 10:37   ` Pavel Machek
2009-06-11 21:48 ` [PATCH 03/19] x86: unify power/cpu_(32|64) global variables Rafael J. Wysocki
2009-06-11 21:48 ` [PATCH 05/19] x86: unify power/cpu_(32|64) regarding restoring processor state Rafael J. Wysocki
2009-06-11 21:48 ` [PATCH 02/19] x86: unify power/cpu_(32|64) headers Rafael J. Wysocki
2009-06-11 21:48 ` [PATCH 04/19] x86: unify power/cpu_(32|64) regarding saving processor state Rafael J. Wysocki
2009-06-11 21:48 ` [PATCH 08/19] PM: Remove unused asm/suspend.h Rafael J. Wysocki
2009-06-11 21:48 ` [PATCH 07/19] x86: unify power/cpu_(32|64).c Rafael J. Wysocki
2009-06-11 21:53 ` [PATCH 12/19] PM/Suspend: Do not shrink memory before suspend Rafael J. Wysocki
2009-06-11 21:56 ` [PATCH 11/19] PM: Remove bus_type suspend_late()/resume_early() V2 Rafael J. Wysocki
2009-06-11 21:59 ` [PATCH 14/19] PM: Remove device_type suspend()/resume() Rafael J. Wysocki
2009-06-11 22:00 ` [PATCH 15/19] Driver Core: Rework platform suspend/resume, print warning Rafael J. Wysocki
2009-06-11 22:00 ` [PATCH 13/19] PM/Hibernate: Move memory shrinking to snapshot.c (rev. 2) Rafael J. Wysocki
2009-06-11 22:01 ` [PATCH 09/19] PM: Rename device_power_down/up() Rafael J. Wysocki
2009-06-11 22:01 ` [PATCH 16/19] PM: Separate suspend to RAM functionality from core Rafael J. Wysocki
2009-06-11 22:02 ` [PATCH 10/19] PM core: rename suspend and resume functions Rafael J. Wysocki
2009-06-11 22:03 ` Rafael J. Wysocki
2009-06-11 22:06 ` [PATCH 00/19] What's in the suspend tree for 2.6.31 Pavel Machek
2009-06-11 22:09 ` [PATCH 10/19] PM core: rename suspend and resume functions Rafael J. Wysocki
2009-06-11 22:12 ` [PATCH 18/19] PM/Hibernate: Move NVS routines into a seperate file (v2) Rafael J. Wysocki
2009-06-11 22:21 ` [PATCH 02/19] x86: unify power/cpu_(32|64) headers Rafael J. Wysocki
2009-06-11 22:21 ` [PATCH 19/19] PM: Add empty suspend/resume device irq functions Rafael J. Wysocki
2009-06-11 22:22 ` [PATCH 17/19] PM/Hibernate: Rename disk.c to hibernate.c Rafael J. Wysocki
     [not found] ` <20090611220652.GA18682@elf.ucw.cz>
2009-06-11 22:24   ` [PATCH 00/19] What's in the suspend tree for 2.6.31 Rafael J. Wysocki
2009-06-11 22:26 ` [PATCH 18/19] PM/Hibernate: Move NVS routines into a seperate file (v2) Rafael J. Wysocki
2009-06-11 22:29 ` Rafael J. Wysocki [this message]
2009-06-12 10:37   ` [PATCH 02/19] x86: unify power/cpu_(32|64) headers Pavel Machek
2009-06-12 10:37   ` Pavel Machek
2009-06-11 22:34 ` [PATCH 03/19] x86: unify power/cpu_(32|64) global variables Rafael J. Wysocki
2009-06-12 10:44   ` Pavel Machek
2009-06-11 22:36 ` [PATCH 04/19] x86: unify power/cpu_(32|64) regarding saving processor state Rafael J. Wysocki
2009-06-11 22:39 ` [PATCH 05/19] x86: unify power/cpu_(32|64) regarding restoring " Rafael J. Wysocki
2009-06-11 22:47 ` [PATCH 07/19] x86: unify power/cpu_(32|64).c Rafael J. Wysocki
2009-06-12 10:50   ` Pavel Machek
2009-06-11 22:48 ` [PATCH 09/19] PM: Rename device_power_down/up() Rafael J. Wysocki
2009-06-12 10:51   ` Pavel Machek
2009-06-11 22:48 ` [PATCH 10/19] PM core: rename suspend and resume functions Rafael J. Wysocki
2009-06-12 10:55   ` Pavel Machek
2009-06-11 22:48 ` [PATCH 11/19] PM: Remove bus_type suspend_late()/resume_early() V2 Rafael J. Wysocki
2009-06-11 22:48 ` [PATCH 12/19] PM/Suspend: Do not shrink memory before suspend Rafael J. Wysocki
2009-06-12 11:02   ` Pavel Machek
     [not found]   ` <20090612110235.GL18682@elf.ucw.cz>
2009-06-12 19:04     ` Rafael J. Wysocki
2009-06-11 22:49 ` [PATCH 13/19] PM/Hibernate: Move memory shrinking to snapshot.c (rev. 2) Rafael J. Wysocki
2009-06-11 22:49 ` [PATCH 14/19] PM: Remove device_type suspend()/resume() Rafael J. Wysocki
2009-06-12 11:03   ` Pavel Machek
2009-06-11 22:49 ` [PATCH 15/19] Driver Core: Rework platform suspend/resume, print warning Rafael J. Wysocki
2009-06-12 11:10   ` Pavel Machek
2009-06-11 22:49 ` [PATCH 16/19] PM: Separate suspend to RAM functionality from core Rafael J. Wysocki
2009-06-11 22:49 ` [PATCH 17/19] PM/Hibernate: Rename disk.c to hibernate.c Rafael J. Wysocki
2009-06-11 22:50 ` [PATCH 18/19] PM/Hibernate: Move NVS routines into a seperate file (v2) Rafael J. Wysocki
2009-06-11 22:50 ` [PATCH 19/19] PM: Add empty suspend/resume device irq functions Rafael J. Wysocki
2009-06-12 11:13   ` Pavel Machek
     [not found]   ` <20090612111317.GP18682@elf.ucw.cz>
2009-06-12 11:32     ` Heiko Carstens
     [not found]     ` <20090612113218.GB6355@osiris.boeblingen.de.ibm.com>
2009-06-12 11:36       ` Pavel Machek
2009-06-11 23:04 ` [PATCH 08/19] PM: Remove unused asm/suspend.h Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=S4AoGnG.A.xE.8UYMKB@chimera \
    --to=rjw@sisk.pl \
    --cc=damm@igel.co.jp \
    --cc=fengguang.wu@intel.com \
    --cc=gregkh@suse.de \
    --cc=heiko.carstens@de.ibm.com \
    --cc=jaswinder@kernel.org \
    --cc=laurosalmito@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=mingo@elte.hu \
    --cc=sergio@larces.uece.br \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox