diff options
author | Adrian Cox <adrian@humboldt.co.uk> | 2006-03-08 17:10:20 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 21:23:21 -0500 |
commit | bbbe1212bd6f815290f782ba5b489467b54131dc (patch) | |
tree | 3964aa125e7039ff005779d0ba88205d1f9e5f3c | |
parent | 7e5b59384eebe35bff8429243f089931ce1cdf38 (diff) |
[PATCH] ppc: Fix platform_notify functions marked __init
While adding USB support to an MV64360 based board this week, I
discovered that all MV64x60 boards in the kernel have platform_notify
functions marked with __init. This causes an oops if a device is added
after boot.
The patch below removes the __init markers. I do not have all these
boards to test on, but the change seems very unlikely to break anything
else.
Signed-off-by: Adrian Cox <adrian@humboldt.co.uk>
Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r-- | arch/ppc/platforms/cpci690.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/ev64260.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/ev64360.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/hdpu.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/katana.c | 2 | ||||
-rw-r--r-- | arch/ppc/platforms/radstone_ppc7d.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/ppc/platforms/cpci690.c b/arch/ppc/platforms/cpci690.c index 55be550a0811..790475c22fd7 100644 --- a/arch/ppc/platforms/cpci690.c +++ b/arch/ppc/platforms/cpci690.c | |||
@@ -288,7 +288,7 @@ cpci690_fixup_mpsc_pdata(struct platform_device *pdev) | |||
288 | pdata->brg_clk_freq = cpci690_get_bus_freq(); | 288 | pdata->brg_clk_freq = cpci690_get_bus_freq(); |
289 | } | 289 | } |
290 | 290 | ||
291 | static int __init | 291 | static int |
292 | cpci690_platform_notify(struct device *dev) | 292 | cpci690_platform_notify(struct device *dev) |
293 | { | 293 | { |
294 | static struct { | 294 | static struct { |
diff --git a/arch/ppc/platforms/ev64260.c b/arch/ppc/platforms/ev64260.c index 6444760caa3a..31e8e21e1d5c 100644 --- a/arch/ppc/platforms/ev64260.c +++ b/arch/ppc/platforms/ev64260.c | |||
@@ -414,7 +414,7 @@ ev64260_fixup_mpsc_pdata(struct platform_device *pdev) | |||
414 | return; | 414 | return; |
415 | } | 415 | } |
416 | 416 | ||
417 | static int __init | 417 | static int |
418 | ev64260_platform_notify(struct device *dev) | 418 | ev64260_platform_notify(struct device *dev) |
419 | { | 419 | { |
420 | static struct { | 420 | static struct { |
diff --git a/arch/ppc/platforms/ev64360.c b/arch/ppc/platforms/ev64360.c index b5f52eba4fc1..104ac9b16e8b 100644 --- a/arch/ppc/platforms/ev64360.c +++ b/arch/ppc/platforms/ev64360.c | |||
@@ -298,7 +298,7 @@ ev64360_fixup_eth_pdata(struct platform_device *pdev) | |||
298 | } | 298 | } |
299 | #endif | 299 | #endif |
300 | 300 | ||
301 | static int __init | 301 | static int |
302 | ev64360_platform_notify(struct device *dev) | 302 | ev64360_platform_notify(struct device *dev) |
303 | { | 303 | { |
304 | static struct { | 304 | static struct { |
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c index 220674d883df..fc869bb5b2b4 100644 --- a/arch/ppc/platforms/hdpu.c +++ b/arch/ppc/platforms/hdpu.c | |||
@@ -351,7 +351,7 @@ static void __init hdpu_fixup_cpustate_pdata(struct platform_device *pd) | |||
351 | } | 351 | } |
352 | #endif | 352 | #endif |
353 | 353 | ||
354 | static int __init hdpu_platform_notify(struct device *dev) | 354 | static int hdpu_platform_notify(struct device *dev) |
355 | { | 355 | { |
356 | static struct { | 356 | static struct { |
357 | char *bus_id; | 357 | char *bus_id; |
diff --git a/arch/ppc/platforms/katana.c b/arch/ppc/platforms/katana.c index 6f3bc6161746..ad21280e8920 100644 --- a/arch/ppc/platforms/katana.c +++ b/arch/ppc/platforms/katana.c | |||
@@ -596,7 +596,7 @@ katana_fixup_mv64xxx_pdata(struct platform_device *pdev) | |||
596 | } | 596 | } |
597 | #endif | 597 | #endif |
598 | 598 | ||
599 | static int __init | 599 | static int |
600 | katana_platform_notify(struct device *dev) | 600 | katana_platform_notify(struct device *dev) |
601 | { | 601 | { |
602 | static struct { | 602 | static struct { |
diff --git a/arch/ppc/platforms/radstone_ppc7d.c b/arch/ppc/platforms/radstone_ppc7d.c index 30188085bd38..bc26b6d71c1d 100644 --- a/arch/ppc/platforms/radstone_ppc7d.c +++ b/arch/ppc/platforms/radstone_ppc7d.c | |||
@@ -709,7 +709,7 @@ ppc7d_fixup_i2c_pdata(struct platform_device *pdev) | |||
709 | } | 709 | } |
710 | #endif | 710 | #endif |
711 | 711 | ||
712 | static int __init ppc7d_platform_notify(struct device *dev) | 712 | static int ppc7d_platform_notify(struct device *dev) |
713 | { | 713 | { |
714 | static struct { | 714 | static struct { |
715 | char *bus_id; | 715 | char *bus_id; |