ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier

PATCH New Uri Yosef 2 participants 6 messages Jan 14, 2010 – Jan 15, 2010

Subsystems (2)

Arm (32-bit) Arm sub-architectures

lore

Share & tools

lore

Uri Yosef

author

2010-01-14 10:06 UTC #0 lore raw

PATCH 1/1 ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier

From: Uri Yosef <[email protected]>

This patch fix mini2440 crash on boot due to improper __initdata qualifier on mini2440_led1_pdata.

Signed-off-by Uri Yosef <[email protected]>

---

diff -ruN a/arch/arm/mach-s3c2440/mach-mini2440.c
b/arch/arm/mach-s3c2440/mach-mini2440.c

arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-14 11:45:39.992255745 +0200 renamed from arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-13 07:15:00.000000000 +0200 +5 -5

@@ -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 Dooks

2010-01-14 10:28 UTC #1 lore raw

PATCH 1/1 ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier

Quoted 4 lines · Uri Yosef

From: Uri Yosef <[email protected]>
This patch fix mini2440 crash on boot due to improper __initdata qualifier on mini2440_led1_pdata.

ok, will apply this to for-linus/samsung

Quoted 53 lines

Signed-off-by Uri Yosef <[email protected]>

---

diff -ruN a/arch/arm/mach-s3c2440/mach-mini2440.c
b/arch/arm/mach-s3c2440/mach-mini2440.c

arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-14 11:45:39.992255745 +0200 renamed from arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-13 07:15:00.000000000 +0200 +5 -5

@@ -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",

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Signature · 5 lines

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

Ben Dooks

2010-01-15 01:16 UTC #2 lore raw

PATCH 1/1 ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier

In reply to Uri Yosef

Quoted 4 lines · Uri Yosef

From: Uri Yosef <[email protected]>
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.

Quoted 53 lines

Signed-off-by Uri Yosef <[email protected]>

---

diff -ruN a/arch/arm/mach-s3c2440/mach-mini2440.c
b/arch/arm/mach-s3c2440/mach-mini2440.c

arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-14 11:45:39.992255745 +0200 renamed from arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-13 07:15:00.000000000 +0200 +5 -5

@@ -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",

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Signature · 5 lines

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

Uri Yosef

author

2010-01-15 05:31 UTC #3 lore raw

PATCH 1/1 ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier

Quoted 21 lines · Ben Dooks

Quoted 4 lines · Uri Yosef
From: Uri Yosef <[email protected]>
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 = {

Quoted 7 lines

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.

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",

-------------- next part --------------
A non-text attachment was scrubbed...
Name: mini2440_remove_led_initdata.patch
Type: application/octet-stream
Size: 1583 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100115/e10a2487/attachment.obj>

Uri Yosef

author

2010-01-15 05:35 UTC #4 lore raw

PATCH 1/1 ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier

Quoted 76 lines · Uri Yosef

Quoted 21 lines · Ben Dooks
Quoted 4 lines · Uri Yosef
From: Uri Yosef <[email protected]>
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 = {
Quoted 7 lines
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.
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
(quoted diff) +0 -0
@@ -399,35 +399,35 @@
 
?/* LEDS */
(quoted diff) +1 -1
-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",
?};
(quoted diff) +1 -1
-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",
?};
(quoted diff) +1 -1
-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",
?};
(quoted diff) +1 -1
-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 ? ?= "",
?};
(quoted diff) +1 -1
-static struct s3c24xx_led_platdata mini2440_led_backlight_pdata __initdata = {
+static struct s3c24xx_led_platdata mini2440_led_backlight_pdata = {

Quoted 4 lines

? ? ? ?.name ? ? ? ? ? = "backlight",
? ? ? ?.gpio ? ? ? ? ? = S3C2410_GPG(4),
? ? ? ?.def_trigger ? ?= "backlight",

Something got wrong with my previous mail.
here it is:
-------
diff -ruN a/arch/arm/mach-s3c2440/mach-mini2440.c
b/arch/arm/mach-s3c2440/mach-mini2440.c

arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-15 07:27:08.789255622 +0200 renamed from arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-13 07:15:00.000000000 +0200 +5 -5

@@ -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 Dooks

2010-01-15 08:17 UTC #5 lore raw

PATCH 1/1 ARM: MINI2440: Fix mini2440 crash on boot due to improper __initdata qualifier

In reply to Uri Yosef

Quoted 25 lines · Uri Yosef

Quoted 24 lines · Ben Dooks
Quoted 4 lines · Uri Yosef
From: Uri Yosef <[email protected]>
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

Quoted 6 lines

Quoted 4 lines
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.

Quoted 47 lines

arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-14 11:45:39.992255745 +0200 renamed from arch/arm/mach-s3c2440/mach-mini2440.c 2010-01-13 07:15:00.000000000 +0200 +5 -5

@@ -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",

Signature · 5 lines

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.