This is a note to let you know that I've just added the patch titled

    drivers/base/platform.c: don't mark

to the 2.6.39-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drivers-base-platform.c-don-t-mark.patch
and it can be found in the queue-2.6.39 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.


>From bb2b43fefab723f4a0760146e7bed59d41a50e53 Mon Sep 17 00:00:00 2001
From: Andrew Morton <a...@linux-foundation.org>
Date: Mon, 23 May 2011 14:44:19 -0700
Subject: drivers/base/platform.c: don't mark
 platform_device_register_resndata() as __init_or_module
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Andrew Morton <a...@linux-foundation.org>

commit bb2b43fefab723f4a0760146e7bed59d41a50e53 upstream.

This reverts 737a3bb9416ce2a7c7a4 ("Driver core: move platform device
creation helpers to .init.text (if MODULE=n)").  That patch assumed that
platform_device_register_resndata() is only ever called from __init code
but that isn't true in the case ioctl->drm_ioctl->radeon_cp_init().

Addresses https://bugzilla.kernel.org/show_bug.cgi?id=35192

Cc: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
Reported-by: Anthony Basile <bluen...@gentoo.org>
Cc: Greg KH <gre...@suse.de>
Cc: David Airlie <airl...@linux.ie>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

---
 drivers/base/platform.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -367,7 +367,7 @@ EXPORT_SYMBOL_GPL(platform_device_unregi
  *
  * Returns &struct platform_device pointer on success, or ERR_PTR() on error.
  */
-struct platform_device *__init_or_module platform_device_register_resndata(
+struct platform_device *platform_device_register_resndata(
                struct device *parent,
                const char *name, int id,
                const struct resource *res, unsigned int num,


Patches currently in stable-queue which might be from a...@linux-foundation.org 
are

queue-2.6.39/mm-memory-failure.c-fix-page-isolated-count-mismatch.patch
queue-2.6.39/mm-fix-negative-commitlimit-when-gigantic-hugepages-are.patch
queue-2.6.39/drivers-tty-serial-pch_uart.c-don-t-oops-if.patch
queue-2.6.39/drivers-base-platform.c-don-t-mark.patch
queue-2.6.39/drivers-misc-lkdtm.c-fix-race-when-crashpoint-is-hit.patch
queue-2.6.39/ksm-fix-null-pointer-dereference-in.patch
queue-2.6.39/taskstats-don-t-allow-duplicate-entries-in-listener-mode.patch

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to