Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 247671 | Differences between
and this patch

Collapse All | Expand All

(-)ati-driver-8-11-orig/common/lib/modules/fglrx/build_mod/kcl_config.h (+2 lines)
Lines 39-42 Link Here
39
#define NULL (void*)0
39
#define NULL (void*)0
40
#endif
40
#endif
41
41
42
//OFF: #define CONFIG_MAGIC_SYSRQ
43
42
#endif
44
#endif
(-)ati-driver-8-11-orig/common/lib/modules/fglrx/build_mod/kcl_debug.c (-3 / +10 lines)
Lines 32-41 Link Here
32
32
33
#include <linux/version.h>
33
#include <linux/version.h>
34
#include <linux/kernel.h>
34
#include <linux/kernel.h>
35
#include <linux/sysrq.h>
36
35
37
#include "kcl_config.h"
36
#include "kcl_config.h"
38
37
38
#ifdef CONFIG_MAGIC_SYSRQ
39
#include <linux/sysrq.h>
40
#endif 
41
39
extern int ATI_API_CALL firegl_debug_kbd_handler(void);
42
extern int ATI_API_CALL firegl_debug_kbd_handler(void);
40
extern int ATI_API_CALL firegl_debug_dump(void);
43
extern int ATI_API_CALL firegl_debug_dump(void);
41
44
Lines 57-62 Link Here
57
    firegl_debug_dump();
60
    firegl_debug_dump();
58
}
61
}
59
62
63
#ifdef CONFIG_MAGIC_SYSRQ
60
static struct sysrq_key_op kcl_debug_sysrq_op =
64
static struct sysrq_key_op kcl_debug_sysrq_op =
61
{
65
{
62
    .handler        = kcl_debug_sysrq_handler,
66
    .handler        = kcl_debug_sysrq_handler,
Lines 70-75 Link Here
70
    .help_msg       = "fgLdump",
74
    .help_msg       = "fgLdump",
71
    .action_msg     = "FGLDUMP",
75
    .action_msg     = "FGLDUMP",
72
};
76
};
77
#endif
73
78
74
/** \brief Print debug information to the OS debug console
79
/** \brief Print debug information to the OS debug console
75
 *  \param fmt printf-like formatting string
80
 *  \param fmt printf-like formatting string
Lines 93-98 Link Here
93
 */
98
 */
94
int ATI_API_CALL KCL_DEBUG_RegKbdHandler(int enable)
99
int ATI_API_CALL KCL_DEBUG_RegKbdHandler(int enable)
95
{
100
{
101
#ifdef CONFIG_MAGIC_SYSRQ
96
    if(enable)
102
    if(enable)
97
    {
103
    {
98
        register_sysrq_key('g', &kcl_debug_sysrq_op);
104
        register_sysrq_key('g', &kcl_debug_sysrq_op);
Lines 101-107 Link Here
101
    {
107
    {
102
        unregister_sysrq_key('g', &kcl_debug_sysrq_op);
108
        unregister_sysrq_key('g', &kcl_debug_sysrq_op);
103
    }
109
    }
104
110
#endif
105
    return 0;
111
    return 0;
106
}
112
}
107
113
Lines 111-116 Link Here
111
 */
117
 */
112
int ATI_API_CALL KCL_DEBUG_RegKbdDumpHandler(int enable)
118
int ATI_API_CALL KCL_DEBUG_RegKbdDumpHandler(int enable)
113
{
119
{
120
#ifdef CONFIG_MAGIC_SYSRQ
114
    if(enable)
121
    if(enable)
115
    {
122
    {
116
        register_sysrq_key('l', &kcl_debug_sysrq_dump_op);
123
        register_sysrq_key('l', &kcl_debug_sysrq_dump_op);
Lines 119-125 Link Here
119
    {
126
    {
120
        unregister_sysrq_key('l', &kcl_debug_sysrq_dump_op);
127
        unregister_sysrq_key('l', &kcl_debug_sysrq_dump_op);
121
    }
128
    }
122
129
#endif
123
    return 0;
130
    return 0;
124
}
131
}
125
132

Return to bug 247671