From: Christoph Lameter <clameter@sgi.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: travis@sgi.com, linux-kernel@vger.kernel.org
Subject: [patch 2/9] x86: threadinfo: Common include files
Date: Mon, 28 Apr 2008 18:52:33 -0700 [thread overview]
Message-ID: <20080429015300.323821221@sgi.com> (raw)
In-Reply-To: 20080429015231.908196699@sgi.com
[-- Attachment #1: merge_includes --]
[-- Type: text/plain, Size: 1048 bytes --]
Move shared includes to a common area in thread_info.h
Adds asm/types.h for x86_64 and linux/compiler.h for x86_32. Not needed but
we can avoid some ifdeffing and it simplifies later joining.
Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
include/asm-x86/thread_info.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Index: linux-2.6/include/asm-x86/thread_info.h
===================================================================
--- linux-2.6.orig/include/asm-x86/thread_info.h 2008-04-28 17:18:24.182686168 -0700
+++ linux-2.6/include/asm-x86/thread_info.h 2008-04-28 17:19:43.520434319 -0700
@@ -7,9 +7,11 @@
#ifndef _ASM_X86_THREAD_INFO_H
#define _ASM_X86_THREAD_INFO_H
-#ifdef CONFIG_X86_32
#include <linux/compiler.h>
#include <asm/page.h>
+#include <asm/types.h>
+
+#ifdef CONFIG_X86_32
#ifndef __ASSEMBLY__
#include <asm/processor.h>
@@ -192,8 +194,6 @@ static inline struct thread_info *curren
#else /* X86_32 */
-#include <asm/page.h>
-#include <asm/types.h>
#include <asm/pda.h>
/*
--
next prev parent reply other threads:[~2008-04-29 1:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-29 1:52 [patch 0/9] [RFC] x86: Merge thread_info_32/64 to thread_info.h Christoph Lameter
2008-04-29 1:52 ` [patch 1/9] x86: merge thread_info.h Christoph Lameter
2008-04-29 1:52 ` Christoph Lameter [this message]
2008-04-29 1:52 ` [patch 3/9] x86: threadinfo: Merge thread sync state definitions Christoph Lameter
2008-04-29 1:52 ` [patch 4/9] x86: common thread_info definitions Christoph Lameter
2008-04-29 1:52 ` [patch 5/9] x86: threadinfo: Merge INIT_THREAD_INFO Christoph Lameter
2008-04-29 1:52 ` [patch 6/9] x86: thread_info: PREEMPT_ACTIVE Christoph Lameter
2008-04-29 1:52 ` [patch 7/9] x86: thread_info: Merget TIF_ flags Christoph Lameter
2008-04-29 1:52 ` [patch 8/9] x86: thread_info: merge tif masks Christoph Lameter
2008-04-29 1:52 ` [patch 9/9] x86: thread_info: Merge thread_info allocation Christoph Lameter
2008-04-29 9:40 ` [patch 0/9] [RFC] x86: Merge thread_info_32/64 to thread_info.h Ingo Molnar
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=20080429015300.323821221@sgi.com \
--to=clameter@sgi.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=travis@sgi.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.