[PATCH] kexec: typo in machine_kexec()

[PATCH] kexec: typo in machine_kexec()

[Horms]

Signed-Off-By: Horms <horms@verge.net.au

 machine_kexec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

b242c77f387d75d1bfa377d1870c0037d9e0c364
diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
index f73d737..beaad58 100644
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
@@ -194,7 +194,7 @@ NORET_TYPE void machine_kexec(struct kim
 	 * set them to a specific selector, but this table is never
 	 * accessed again you set the segment to a different selector.
 	 *
-	 * The more common model is are caches where the behide
+	 * The more common model is are caches where the behind
 	 * the scenes work is done, but is also dropped at arbitrary
 	 * times.
 	 *

Re: [PATCH] kexec: typo in machine_kexec()

[Randy.Dunlap]

On Wed, 5 Apr 2006 08:48:08 +0900 Horms wrote:

> Signed-Off-By: Horms <horms@verge.net.au
> 
>  machine_kexec.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Can you use diffstat -p1 ?  does git allow/support that option, so that
more complete filenames are visible?

> b242c77f387d75d1bfa377d1870c0037d9e0c364
> diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
> index f73d737..beaad58 100644
> --- a/arch/i386/kernel/machine_kexec.c
> +++ b/arch/i386/kernel/machine_kexec.c
> @@ -194,7 +194,7 @@ NORET_TYPE void machine_kexec(struct kim
>  	 * set them to a specific selector, but this table is never
>  	 * accessed again you set the segment to a different selector.
>  	 *
> -	 * The more common model is are caches where the behide
> +	 * The more common model is are caches where the behind

Also delete /are/, but that sentence and the previous one still need some
work, so fixing "behide" isn't a big deal IMO.  However, Eric can decide
about the patch; he is the kexec maintainer.

>  	 * the scenes work is done, but is also dropped at arbitrary
>  	 * times.
>  	 *

---
~Randy

Re: [PATCH] kexec: typo in machine_kexec()

[Con Kolivas]

On Wednesday 05 April 2006 09:48, Horms wrote:
> Signed-Off-By: Horms <horms@verge.net.au
>
>  machine_kexec.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> b242c77f387d75d1bfa377d1870c0037d9e0c364
> diff --git a/arch/i386/kernel/machine_kexec.c
> b/arch/i386/kernel/machine_kexec.c index f73d737..beaad58 100644
> --- a/arch/i386/kernel/machine_kexec.c
> +++ b/arch/i386/kernel/machine_kexec.c
> @@ -194,7 +194,7 @@ NORET_TYPE void machine_kexec(struct kim
>  	 * set them to a specific selector, but this table is never
>  	 * accessed again you set the segment to a different selector.
>  	 *
> -	 * The more common model is are caches where the behide
> +	 * The more common model is are caches where the behind

If you're going to fix that how about fixing the "is are" 

Cheers,
Con

Re: [PATCH] kexec: typo in machine_kexec()

[Eric W. Biederman]

"Randy.Dunlap" <rdunlap@xenotime.net> writes:

> On Wed, 5 Apr 2006 08:48:08 +0900 Horms wrote:
>
>> Signed-Off-By: Horms <horms@verge.net.au
>> 
>>  machine_kexec.c |    2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> Can you use diffstat -p1 ?  does git allow/support that option, so that
> more complete filenames are visible?
>
>> b242c77f387d75d1bfa377d1870c0037d9e0c364
>> diff --git a/arch/i386/kernel/machine_kexec.c
> b/arch/i386/kernel/machine_kexec.c
>> index f73d737..beaad58 100644
>> --- a/arch/i386/kernel/machine_kexec.c
>> +++ b/arch/i386/kernel/machine_kexec.c
>> @@ -194,7 +194,7 @@ NORET_TYPE void machine_kexec(struct kim
>>  	 * set them to a specific selector, but this table is never
>>  	 * accessed again you set the segment to a different selector.
>>  	 *
>> -	 * The more common model is are caches where the behide
>> +	 * The more common model is are caches where the behind
>
> Also delete /are/, but that sentence and the previous one still need some
> work, so fixing "behide" isn't a big deal IMO.  However, Eric can decide
> about the patch; he is the kexec maintainer.

Ok.  Randy I think your name is still in Maintainers.  
Should we send Linus a bugfix patch to remove it ?

Eric

Re: [PATCH] kexec: typo in machine_kexec()

[Horms]

On Tue, Apr 04, 2006 at 08:05:57PM -0700, Randy.Dunlap wrote:
> On Wed, 5 Apr 2006 08:48:08 +0900 Horms wrote:
> 
> > Signed-Off-By: Horms <horms@verge.net.au
> > 
> >  machine_kexec.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Can you use diffstat -p1 ?  does git allow/support that option, so that
> more complete filenames are visible?

Sure, I have done that. I actually use a script to grab
the changelog (of my local commit), do the diffstat, and get the 
patch, as I'm not sure how to get git to do that in one pass.

> > -	 * The more common model is are caches where the behide
> > +	 * The more common model is are caches where the behind
> 
> Also delete /are/, but that sentence and the previous one still need some
> work, so fixing "behide" isn't a big deal IMO.  However, Eric can decide
> about the patch; he is the kexec maintainer.

Yeah, I puzzled over it a bit which is why I send in my original (poor) fix.
Removing the are helps a lot. Here is an updated patch which is
marginally better than my first pass.

kexec: comment fixes in machine_kexec()

 arch/i386/kernel/machine_kexec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

720f4f4a47cf856a705b59875c099770d3b4bd5f
diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
index f73d737..d31d250 100644
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
@@ -194,7 +194,7 @@ NORET_TYPE void machine_kexec(struct kim
 	 * set them to a specific selector, but this table is never
 	 * accessed again you set the segment to a different selector.
 	 *
-	 * The more common model is are caches where the behide
+	 * The more common model is caches where the behind
 	 * the scenes work is done, but is also dropped at arbitrary
 	 * times.
 	 *

Re: [PATCH] kexec: typo in machine_kexec()

[Con Kolivas]

On Wednesday 05 April 2006 15:57, Horms wrote:
> -	 * The more common model is are caches where the behide
> +	 * The more common model is caches where the behind
>  	 * the scenes work is done, but is also dropped at arbitrary
>  	 * times.
>  	 *

How about

The common model usually involves caches behind the scenes where the work is 
done, but dropped at arbitrary times.

Cheers,
Con

[PATCH] kexec: update MAINTAINERS

[Randy.Dunlap]

From: Randy Dunlap <rdunlap@xenotime.net>

Eric is the kexec maintainer.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 MAINTAINERS |    2 --
 1 files changed, 2 deletions(-)

--- linux-2617-rc1.orig/MAINTAINERS
+++ linux-2617-rc1/MAINTAINERS
@@ -1556,9 +1556,7 @@ S:	Maintained
 
 KEXEC
 P:	Eric Biederman
-P:	Randy Dunlap
 M:	ebiederm@xmission.com
-M:	rdunlap@xenotime.net
 W:	http://www.xmission.com/~ebiederm/files/kexec/
 L:	linux-kernel@vger.kernel.org
 L:	fastboot@osdl.org


---

Re: [PATCH] kexec: typo in machine_kexec()

[Eric W. Biederman]

How does this look for making that comment readable?

Eric


diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
index f73d737..7a344b6 100644
--- a/arch/i386/kernel/machine_kexec.c
+++ b/arch/i386/kernel/machine_kexec.c
@@ -189,14 +189,11 @@ NORET_TYPE void machine_kexec(struct kim
 	memcpy((void *)reboot_code_buffer, relocate_new_kernel,
 						relocate_new_kernel_size);
 
-	/* The segment registers are funny things, they are
-	 * automatically loaded from a table, in memory wherever you
-	 * set them to a specific selector, but this table is never
-	 * accessed again you set the segment to a different selector.
-	 *
-	 * The more common model is are caches where the behide
-	 * the scenes work is done, but is also dropped at arbitrary
-	 * times.
+	/* The segment registers are funny things, they have both a
+	 * visible and an invisible part.  Whenver the visible part is
+	 * set to a specific selector, the invisible part is loaded
+	 * with from a table in memory.  At no other time is the
+	 * descriptor table in memory accessed. 
 	 *
 	 * I take advantage of this here by force loading the
 	 * segments, before I zap the gdt with an invalid value.

Re: [PATCH] kexec: typo in machine_kexec()

[Randy.Dunlap]

On Wed, 05 Apr 2006 09:49:40 -0600 Eric W. Biederman wrote:

one typo (below):

> How does this look for making that comment readable?
> 
> Eric
> 
> 
> diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c
> index f73d737..7a344b6 100644
> --- a/arch/i386/kernel/machine_kexec.c
> +++ b/arch/i386/kernel/machine_kexec.c
> @@ -189,14 +189,11 @@ NORET_TYPE void machine_kexec(struct kim
>  	memcpy((void *)reboot_code_buffer, relocate_new_kernel,
>  						relocate_new_kernel_size);
>  
> -	/* The segment registers are funny things, they are
> -	 * automatically loaded from a table, in memory wherever you
> -	 * set them to a specific selector, but this table is never
> -	 * accessed again you set the segment to a different selector.
> -	 *
> -	 * The more common model is are caches where the behide
> -	 * the scenes work is done, but is also dropped at arbitrary
> -	 * times.
> +	/* The segment registers are funny things, they have both a
> +	 * visible and an invisible part.  Whenver the visible part is
*                                          Whenever
> +	 * set to a specific selector, the invisible part is loaded
> +	 * with from a table in memory.  At no other time is the
> +	 * descriptor table in memory accessed. 
>  	 *
>  	 * I take advantage of this here by force loading the
>  	 * segments, before I zap the gdt with an invalid value.

Much better, thanks.

---
~Randy

Re: [PATCH] kexec: typo in machine_kexec()

[Horms]

kexec: rework kexec_crash logic to make it a little less nested

Signed-Off-By: Simon Horman <horms@verge.net.au>

 kernel/kexec.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

6d28ed0c03ff2d9345a5b198a52f6ee3cc7dd424
diff --git a/kernel/kexec.c b/kernel/kexec.c
index bf39d28..281736f 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1042,6 +1042,7 @@ #endif
 
 void crash_kexec(struct pt_regs *regs)
 {
+	struct pt_regs fixed_regs;
 	struct kimage *image;
 	int locked;
 
@@ -1055,16 +1056,15 @@ void crash_kexec(struct pt_regs *regs)
 	 * sufficient.  But since I reuse the memory...
 	 */
 	locked = xchg(&kexec_lock, 1);
-	if (!locked) {
-		image = xchg(&kexec_crash_image, NULL);
-		if (image) {
-			struct pt_regs fixed_regs;
-			crash_setup_regs(&fixed_regs, regs);
-			machine_crash_shutdown(&fixed_regs);
-			machine_kexec(image);
-		}
-		xchg(&kexec_lock, 0);
+	if (locked)
+		return;
+	image = xchg(&kexec_crash_image, NULL);
+	if (image) {
+		crash_setup_regs(&fixed_regs, regs);
+		machine_crash_shutdown(&fixed_regs);
+		machine_kexec(image);
 	}
+	xchg(&kexec_lock, 0);
 }
 
 static int __init crash_notes_memory_init(void)