From: Andrew Morton <a...@linux-foundation.org>
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=13130
Just remove this sysrq handler - it's doing various bad things from
hardirq context and clearly isn't used much at all.
Reported-by: Darren Salt <li...@youmustbejoking.demon.co.uk>
Cc: Eric Anholt <e...@anholt.net>
Cc: Dave Airlie <airl...@linux.ie>
Cc: Hannes Eder <han...@hanneseder.net>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
---
drivers/gpu/drm/i915/intel_fb.c | 14 --------------
1 file changed, 14 deletions(-)
diff -puN
drivers/gpu/drm/i915/intel_fb.c~drivers-gpu-drm-i915-intel_fbc-remove-sysrq-g-handler
drivers/gpu/drm/i915/intel_fb.c
---
a/drivers/gpu/drm/i915/intel_fb.c~drivers-gpu-drm-i915-intel_fbc-remove-sysrq-g-handler
+++ a/drivers/gpu/drm/i915/intel_fb.c
@@ -31,7 +31,6 @@
#include <linux/mm.h>
#include <linux/tty.h>
#include <linux/slab.h>
-#include <linux/sysrq.h>
#include <linux/delay.h>
#include <linux/fb.h>
#include <linux/init.h>
@@ -857,17 +856,6 @@ void intelfb_restore(void)
drm_crtc_helper_set_config(&kernelfb_mode);
}
-static void intelfb_sysrq(int dummy1, struct tty_struct *dummy3)
-{
- intelfb_restore();
-}
-
-static struct sysrq_key_op sysrq_intelfb_restore_op = {
- .handler = intelfb_sysrq,
- .help_msg = "force-fb(G)",
- .action_msg = "Restore framebuffer console",
-};
-
int intelfb_probe(struct drm_device *dev)
{
int ret;
@@ -898,8 +886,6 @@ int intelfb_probe(struct drm_device *dev
ret = intelfb_single_fb_probe(dev);
}
- register_sysrq_key('g', &sysrq_intelfb_restore_op);
-
return ret;
}
EXPORT_SYMBOL(intelfb_probe);
_
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
--
_______________________________________________
Dri-devel mailing list
Dri-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dri-devel
