From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier
Date: Fri, 15 Jan 2010 08:17:41 +0000 [thread overview]
Message-ID: <20100115081741.GC3738@trinity.fluff.org> (raw)
In-Reply-To: <c7df016d1001142131v104c1abbn984121fb5bf67dc8@mail.gmail.com>
On Fri, Jan 15, 2010 at 07:31:55AM +0200, Uri Yosef wrote:
> On Fri, Jan 15, 2010 at 3:16 AM, Ben Dooks <ben-linux@fluff.org> wrote:
> > On Thu, Jan 14, 2010 at 12:06:32PM +0200, Uri Yosef wrote:
> >> From: Uri Yosef <uri.yosef@gmail.com>
> >>
> >> This patch fix mini2440 crash on boot due to improper __initdata
> >> qualifier on mini2440_led1_pdata.
> >
> > I've tried to apply this, but git-am is refusing to belive it is a valid
> > patch file. The only thing I can see wrong is that something has changed
> > the TABs in the mail into spaces. However having reduced it to a single
> > line change it is still refusing to apply.
> >
> > Applying: ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier
> > error: patch failed: arch/arm/mach-s3c2440/mach-mini2440.c:402
> > error: arch/arm/mach-s3c2440/mach-mini2440.c: patch does not apply
> > Patch failed at 0001.
> >
> > $ git apply -v yuri
> > Checking patch arch/arm/mach-s3c2440/mach-mini2440.c...
> > error: while searching for:
> > static struct s3c24xx_led_platdata mini2440_led1_pdata __initdata = {
> >
> > error: patch failed: arch/arm/mach-s3c2440/mach-mini2440.c:402
> > error: arch/arm/mach-s3c2440/mach-mini2440.c: patch does not apply
> >
> > seems to suggest something else got borked with the formatting.
> >
> > Please sort this out and re-send.
> >
>
> Re-send, patch file also included.
I've managed to apply this now to for-linus/samsung and sent a pull request
thanks.
> diff -ruN a/arch/arm/mach-s3c2440/mach-mini2440.c
> b/arch/arm/mach-s3c2440/mach-mini2440.c
> --- a/arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-13
> 07:15:00.000000000 +0200
> +++ b/arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-15
> 07:27:08.789255622 +0200
> @@ -399,35 +399,35 @@
>
> /* LEDS */
>
> -static struct s3c24xx_led_platdata mini2440_led1_pdata __initdata = {
> +static struct s3c24xx_led_platdata mini2440_led1_pdata = {
> .name = "led1",
> .gpio = S3C2410_GPB(5),
> .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
> .def_trigger = "heartbeat",
> };
>
> -static struct s3c24xx_led_platdata mini2440_led2_pdata __initdata = {
> +static struct s3c24xx_led_platdata mini2440_led2_pdata = {
> .name = "led2",
> .gpio = S3C2410_GPB(6),
> .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
> .def_trigger = "nand-disk",
> };
>
> -static struct s3c24xx_led_platdata mini2440_led3_pdata __initdata = {
> +static struct s3c24xx_led_platdata mini2440_led3_pdata = {
> .name = "led3",
> .gpio = S3C2410_GPB(7),
> .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
> .def_trigger = "mmc0",
> };
>
> -static struct s3c24xx_led_platdata mini2440_led4_pdata __initdata = {
> +static struct s3c24xx_led_platdata mini2440_led4_pdata = {
> .name = "led4",
> .gpio = S3C2410_GPB(8),
> .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE,
> .def_trigger = "",
> };
>
> -static struct s3c24xx_led_platdata mini2440_led_backlight_pdata __initdata = {
> +static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = {
> .name = "backlight",
> .gpio = S3C2410_GPG(4),
> .def_trigger = "backlight",
--
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
prev parent reply other threads:[~2010-01-15 8:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-14 10:06 [PATCH] ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier Uri Yosef
2010-01-14 10:28 ` Ben Dooks
2010-01-15 1:16 ` Ben Dooks
2010-01-15 5:31 ` Uri Yosef
2010-01-15 5:35 ` Uri Yosef
2010-01-15 8:17 ` Ben Dooks [this message]
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=20100115081741.GC3738@trinity.fluff.org \
--to=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.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).