From: Jaswinder Singh Rajput <jaswinder@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Christoph Lameter <cl@linux-foundation.org>,
David Howells <dhowells@redhat.com>, Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
x86 maintainers <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH -tip V2] x86: thread_info.h moving comment to where it should be
Date: Tue, 07 Jul 2009 02:35:09 +0530 [thread overview]
Message-ID: <1246914309.2478.2.camel@ht.satnam> (raw)
In-Reply-To: <alpine.LFD.2.00.0907062052230.19480@localhost.localdomain>
On Mon, 2009-07-06 at 20:54 +0200, Thomas Gleixner wrote:
> On Mon, 6 Jul 2009, Jaswinder Singh Rajput wrote:
> >
> > By mistake commit 2052e8d40ad58 moved following comment to wrong place,
> > where it does not make any sense :
>
> Wrong. commit 2052e8d4 had the comments in the right place. commit
> 3351cc03 replaced the two identical INIT_THREAD_INFO macros and did
> not update the comments.
>
Ahh so you was also part of it, here is updated patch:
[PATCH -tip] x86: thread_info.h moving comment to where it should be
By mistake commit 3351cc03 forget to move following comment along
with INIT_THREAD_INFO :
"preempt_count needs to be 1 initially, until the scheduler is functional."
Moving comment back to right place where preempt_count is setting to 1
Also by mistake commit 2052e8d4 forget to fix extra line which is not required.
Removed that extra line.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
arch/x86/include/asm/thread_info.h | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index b078352..1131636 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -43,6 +43,9 @@ struct thread_info {
int uaccess_err;
};
+/*
+ * preempt_count needs to be 1 initially, until the scheduler is functional
+ */
#define INIT_THREAD_INFO(tsk) \
{ \
.task = &tsk, \
@@ -169,12 +172,9 @@ struct thread_info {
#define STACK_WARN (THREAD_SIZE/8)
/*
* macros/functions for gaining access to the thread information structure
- *
- * preempt_count needs to be 1 initially, until the scheduler is functional.
*/
#ifndef __ASSEMBLY__
-
/* how to get the current stack pointer from C */
register unsigned long current_stack_pointer asm("esp") __used;
@@ -205,7 +205,6 @@ static inline struct thread_info *current_thread_info(void)
/*
* macros/functions for gaining access to the thread information structure
- * preempt_count needs to be 1 initially, until the scheduler is functional.
*/
#ifndef __ASSEMBLY__
DECLARE_PER_CPU(unsigned long, kernel_stack);
--
1.6.0.6
next prev parent reply other threads:[~2009-07-06 21:06 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-06 11:32 [PATCH -tip] " Jaswinder Singh Rajput
2009-07-06 18:54 ` Thomas Gleixner
2009-07-06 21:05 ` Jaswinder Singh Rajput [this message]
2009-07-06 22:44 ` [PATCH -tip V2] " Thomas Gleixner
2009-07-07 5:21 ` Jaswinder Singh Rajput
2009-07-07 16:15 ` Christoph Lameter
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=1246914309.2478.2.camel@ht.satnam \
--to=jaswinder@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=cl@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®