Re: Please revert 86c0baf123e474b6eb404798926ecf62b426bf3a

[Russell King <rmk+lkml@arm.linux.org.uk>]

[-- Attachment #1: Type: text/plain, Size: 780 bytes --]

On Tue, May 08, 2007 at 02:49:28PM +0100, Russell King wrote:
> The change:
> 
> +#ifdef CONFIG_HOTPLUG_CPU
> +#define __INIT		.section	".text","ax"
> +#define __INITDATA	.section	".data","aw"
> +#else
>  #define __INIT		.section	".init.text","ax"
> -#define __FINIT		.previous
>  #define __INITDATA	.section	".init.data","aw"
> +#endif
> +#define __FINIT		.previous
> 
> breaks ARM, since the ARM startup code moves from the start of the image
> to somewhere in the middle of the kernel image.  (That's trivially fixable.)

Although I've worked around this, I still would like this fixed.
Prarit's produced a patch (mail attached) which should fix it,
can we get it merged please?

-- 
Russell King
 Linux kernel    2.6 ARM Linux   - http://www.arm.linux.org.uk/
 maintainer of:

[-- Attachment #2: Type: message/rfc822, Size: 3746 bytes --]

From: Prarit Bhargava <prarit@redhat.com>
To: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, rmk+lkml@arm.linux.org.uk, dzickus@redhat.com
Cc: Prarit Bhargava <prarit@redhat.com>
Subject: [PATCH] Remove cpu hotplug defines for __INIT & __INITDATA
Date: Wed, 9 May 2007 13:25:32 -0400
Message-ID: <20070509172532.16700.33405.sendpatchset@prarit.boston.redhat.com>

Russell and Andrew,

After examining what was checked in and the code base I discovered that most
of 86c0baf123e474b6eb404798926ecf62b426bf3a wasn't necessary anymore....

So here's a patch that reverts the last part of that changeset:




Revert part of 86c0baf123e474b6eb404798926ecf62b426bf3a.

The kernel has moved forward to a state where the original change is not
necessary.  After porting forward, this final version of the patch was
applied and broke non-x86 architectures.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>

diff --git a/include/linux/init.h b/include/linux/init.h
index 8bc32bb..e007ae4 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -52,14 +52,9 @@
 #endif
 
 /* For assembly routines */
-#ifdef CONFIG_HOTPLUG_CPU
-#define __INIT		.section	".text","ax"
-#define __INITDATA	.section	".data","aw"
-#else
 #define __INIT		.section	".init.text","ax"
-#define __INITDATA	.section	".init.data","aw"
-#endif
 #define __FINIT		.previous
+#define __INITDATA	.section	".init.data","aw"
 
 #ifndef __ASSEMBLY__
 /*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/