From: Changli Gao <xiaosuo@gmail.com>
To: linux-next@vger.kernel.org
Cc: xiaosuo <xiaosuo@gmail.com>
Subject: [PATCH] drm: build error when magic sysrq isn't enabled
Date: Wed, 31 Mar 2010 12:18:00 +0800 [thread overview]
Message-ID: <4BB2CCF8.6020806@gmail.com> (raw)
drm build error when magic sysrq isn't enabled
sysrq_drm_fb_helper_restore_op is only valid when magic sysrq is
enabled, but it is used whenever magic sysrq is enabled or not.
Signed-off-by: Changli Gao <xiaosuo@gmail.com>
----
drivers/gpu/drm/drm_fb_helper.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 85cdf05..0e5b4f6 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -913,7 +913,9 @@ int drm_fb_helper_single_fb_probe(struct drm_device *dev,
printk(KERN_INFO "registered panic notifier\n");
atomic_notifier_chain_register(&panic_notifier_list,
&paniced);
+#ifdef CONFIG_MAGIC_SYSRQ
register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
+#endif
}
list_add(&fb_helper->kernel_fb_list, &kernel_fb_helper_list);
return 0;
@@ -927,7 +929,9 @@ void drm_fb_helper_free(struct drm_fb_helper *helper)
printk(KERN_INFO "unregistered panic notifier\n");
atomic_notifier_chain_unregister(&panic_notifier_list,
&paniced);
+#ifdef CONFIG_MAGIC_SYSRQ
unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
+#endif
}
drm_fb_helper_crtc_free(helper);
fb_dealloc_cmap(&helper->fb->fbdev->cmap);
reply other threads:[~2010-03-31 4:18 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4BB2CCF8.6020806@gmail.com \
--to=xiaosuo@gmail.com \
--cc=linux-next@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.