From: Glauber de Oliveira Costa <gcosta@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: ehabkost@redhat.com, ak@suse.de,
virtualization@lists.linux-foundation.org, chrisw@sous-sol.org,
tglx@linutronix.de, anthony@codemonkey.ws, hpa@zytor.com,
akpm@linux-foundation.org,
Glauber de Oliveira Costa <gcosta@redhat.com>,
mingo@elte.hu
Subject: [PATCH 9/9] unify system.h
Date: Wed, 5 Dec 2007 13:08:33 -0200 [thread overview]
Message-ID: <11968673573299-git-send-email-gcosta@redhat.com> (raw)
In-Reply-To: <11968673522098-git-send-email-gcosta@redhat.com>
This patch finishes the unification of system.h file.
i386 needs a constant to be defined, and it is defined inside an ifdef
Other than that, pretty much nothing but includes are left in the arch
specific headers, and they are deleted.
Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
---
include/asm-x86/system.h | 10 ++++++++--
include/asm-x86/system_32.h | 15 ---------------
include/asm-x86/system_64.h | 10 ----------
3 files changed, 8 insertions(+), 27 deletions(-)
diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
index fd2abfd..9460db4 100644
--- a/include/asm-x86/system.h
+++ b/include/asm-x86/system.h
@@ -2,8 +2,12 @@
#define _ASM_X86_SYSTEM_H_
#include <asm/asm.h>
+#include <asm/segment.h>
+#include <asm/cpufeature.h>
+#include <asm/cmpxchg.h>
#include <linux/kernel.h>
+#include <linux/irqflags.h>
#ifdef CONFIG_X86_32
#define AT_VECTOR_SIZE_ARCH 2 /* entries in ARCH_DLINFO */
@@ -34,7 +38,10 @@ extern struct task_struct *FASTCALL(__switch_to(struct task_struct *prev,
"2" (prev), "d" (next)); \
} while (0)
-# include "system_32.h"
+/*
+ * disable hlt during certain critical i/o operations
+ */
+#define HAVE_DISABLE_HLT
#else
#define __SAVE(reg, offset) "movq %%" #reg ",(14-" #offset ")*8(%%rsp)\n\t"
#define __RESTORE(reg, offset) "movq (14-" #offset ")*8(%%rsp),%%" #reg "\n\t"
@@ -69,7 +76,6 @@ extern struct task_struct *FASTCALL(__switch_to(struct task_struct *prev,
[thread_info] "i" (offsetof(struct task_struct, stack)), \
[pda_pcurrent] "i" (offsetof(struct x8664_pda, pcurrent)) \
: "memory", "cc" __EXTRA_CLOBBER)
-# include "system_64.h"
#endif
#ifdef __KERNEL__
diff --git a/include/asm-x86/system_32.h b/include/asm-x86/system_32.h
deleted file mode 100644
index 83af464..0000000
--- a/include/asm-x86/system_32.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ASM_SYSTEM_H
-#define __ASM_SYSTEM_H
-
-#include <asm/segment.h>
-#include <asm/cpufeature.h>
-#include <asm/cmpxchg.h>
-
-#include <linux/irqflags.h>
-
-/*
- * disable hlt during certain critical i/o operations
- */
-#define HAVE_DISABLE_HLT
-
-#endif
diff --git a/include/asm-x86/system_64.h b/include/asm-x86/system_64.h
deleted file mode 100644
index 8d2059f..0000000
--- a/include/asm-x86/system_64.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_SYSTEM_H
-#define __ASM_SYSTEM_H
-
-#include <asm/segment.h>
-#include <asm/cmpxchg.h>
-
-
-#include <linux/irqflags.h>
-
-#endif
--
1.4.4.2
next prev parent reply other threads:[~2007-12-05 15:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-05 15:08 [PATCH 0/9 - v2] Integrate system.h Glauber de Oliveira Costa
2007-12-05 15:08 ` [PATCH 1/9] remove volatile keyword from clflush Glauber de Oliveira Costa
2007-12-05 20:22 ` [PATCH 0/9 - v2] Integrate system.h Ingo Molnar
[not found] ` <1196867319253-git-send-email-gcosta@redhat.com>
2007-12-05 15:08 ` [PATCH 2/9] put together equal pieces of system.h Glauber de Oliveira Costa
[not found] ` <11968673241599-git-send-email-gcosta@redhat.com>
2007-12-05 15:08 ` [PATCH 3/9] unify load_segment macro Glauber de Oliveira Costa
[not found] ` <11968673291072-git-send-email-gcosta@redhat.com>
2007-12-05 15:08 ` [PATCH 4/9] remove references to cr8 register Glauber de Oliveira Costa
[not found] ` <1196867333728-git-send-email-gcosta@redhat.com>
2007-12-05 15:08 ` [PATCH 5/9] unify paravirt parts of system.h Glauber de Oliveira Costa
[not found] ` <11968673383347-git-send-email-gcosta@redhat.com>
2007-12-05 15:08 ` [PATCH 6/9] remove unused macro Glauber de Oliveira Costa
2007-12-05 15:08 ` [PATCH 7/9] unify smp parts of system.h Glauber de Oliveira Costa
2007-12-05 15:08 ` [PATCH 8/9] move switch_to macro to system.h Glauber de Oliveira Costa
2007-12-05 15:08 ` Glauber de Oliveira Costa [this message]
2007-12-06 21:11 ` [PATCH 1/9] remove volatile keyword from clflush Jeremy Fitzhardinge
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=11968673573299-git-send-email-gcosta@redhat.com \
--to=gcosta@redhat.com \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=anthony@codemonkey.ws \
--cc=chrisw@sous-sol.org \
--cc=ehabkost@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=virtualization@lists.linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).