Jason:
Not sure we want to do this. Certainly no criticism of anyone. I'm also
no expert in kernel coding style.
thanks,
bob
Some suggested kernel coding style cleanups.
Signed-off-by: Bob Picco <[EMAIL PROTECTED]>
kernel/kgdb.c | 57 ++++++++++++++++++++++++++++++---------------------------
1 file changed, 30 insertions(+), 27 deletions(-)
Index: git.jwessel/kernel/kgdb.c
===================================================================
--- git.jwessel.orig/kernel/kgdb.c 2007-05-18 14:53:58.000000000 -0400
+++ git.jwessel/kernel/kgdb.c 2007-05-21 11:50:58.000000000 -0400
@@ -72,7 +72,7 @@ int kgdb_may_fault;
int kgdb_from_module_registered = 0;
/* We provide a kgdb_io_ops structure that may be overriden. */
-struct kgdb_io __attribute__ ((weak)) kgdb_io_ops;
+struct kgdb_io __weak kgdb_io_ops;
static struct kgdb_io kgdb_io_ops_prev[MAX_KGDB_IO_HANDLERS];
static int kgdb_io_handler_cnt = 0;
@@ -132,38 +132,34 @@ static struct notifier_block kgdb_reboot
.priority = INT_MAX,
};
-int __attribute__ ((weak))
- kgdb_validate_break_address(unsigned long addr)
+int __weak kgdb_validate_break_address(unsigned long addr)
{
- int error = 0;
+ int error;
char tmp_variable[BREAK_INSTR_SIZE];
+
error = kgdb_get_mem((char *)addr, tmp_variable, BREAK_INSTR_SIZE);
return error;
}
-int __attribute__ ((weak))
- kgdb_arch_set_breakpoint(unsigned long addr, char *saved_instr)
+int __weak kgdb_arch_set_breakpoint(unsigned long addr, char *saved_instr)
{
- int error = 0;
- if ((error = kgdb_get_mem((char *)addr,
- saved_instr, BREAK_INSTR_SIZE)) < 0)
- return error;
+ int error;
- if ((error = kgdb_set_mem((char *)addr, kgdb_ops->gdb_bpt_instr,
- BREAK_INSTR_SIZE)) < 0)
- return error;
- return 0;
+ error = kgdb_get_mem((char *)addr, saved_instr, BREAK_INSTR_SIZE);
+ if (error < 0)
+ return error;
+
+ error = kgdb_set_mem((char *)addr, kgdb_ops->gdb_bpt_instr,
+ BREAK_INSTR_SIZE);
+ return error;
}
-int __attribute__ ((weak))
- kgdb_arch_remove_breakpoint(unsigned long addr, char *bundle)
+int __weak kgdb_arch_remove_breakpoint(unsigned long addr, char *bundle)
{
+ int error;
- int error = 0;
- if ((error =kgdb_set_mem((char *)addr, (char *)bundle,
- BREAK_INSTR_SIZE)) < 0)
- return error;
- return 0;
+ error = kgdb_set_mem((char *)addr, (char *)bundle, BREAK_INSTR_SIZE);
+ return error;
}
static int hex(char ch)
@@ -184,6 +180,7 @@ static void get_packet(char *buffer)
unsigned char xmitcsum;
int count;
char ch;
+
if (!kgdb_io_ops.read_char)
return;
do {
@@ -524,7 +521,7 @@ static inline void error_packet(char *pk
pkt[3] = '\0';
}
-static char *pack_threadid(char *pkt, threadref * id)
+static char *pack_threadid(char *pkt, threadref *id)
{
char *limit;
unsigned char *altid;
@@ -537,7 +534,7 @@ static char *pack_threadid(char *pkt, th
return pkt;
}
-void int_to_threadref(threadref * id, int value)
+void int_to_threadref(threadref *id, int value)
{
unsigned char *scan;
int i = 4;
@@ -646,6 +643,7 @@ int kgdb_activate_sw_breakpoints(void)
int i;
int error = 0;
unsigned long addr;
+
for (i = 0; i < MAX_BREAKPOINTS; i++) {
if (kgdb_break[i].state != bp_set)
continue;
@@ -672,6 +670,7 @@ static int kgdb_set_sw_break(unsigned lo
{
int i, breakno = -1;
int error = 0;
+
if ((error = kgdb_validate_break_address(addr)) < 0)
return error;
for (i = 0; i < MAX_BREAKPOINTS; i++) {
@@ -710,6 +709,7 @@ int kgdb_deactivate_sw_breakpoints(void)
int i;
int error = 0;
unsigned long addr;
+
for (i = 0; i < MAX_BREAKPOINTS; i++) {
if (kgdb_break[i].state != bp_active)
continue;
@@ -747,6 +747,7 @@ static int kgdb_remove_sw_break(unsigned
int kgdb_isremovedbreak(unsigned long addr)
{
int i;
+
for (i = 0; i < MAX_BREAKPOINTS; i++) {
if ((kgdb_break[i].state == bp_removed) &&
(kgdb_break[i].bpt_addr == addr)) {
@@ -781,9 +782,9 @@ int remove_all_break(void)
static inline int shadow_pid(int realpid)
{
- if (realpid) {
+ if (realpid)
return realpid;
- }
+
return pid_max + smp_processor_id();
}
@@ -1417,7 +1418,8 @@ static struct notifier_block kgdb_module
void kgdb_nmihook(int cpu, void *regs)
{
#ifdef CONFIG_SMP
- if (!atomic_read(&procindebug[cpu]) && atomic_read(&debugger_active) !=
(cpu + 1))
+ if (!atomic_read(&procindebug[cpu]) &&
+ atomic_read(&debugger_active) != (cpu + 1))
kgdb_wait((struct pt_regs *)regs);
#endif
}
@@ -1761,7 +1763,8 @@ static int kgdb_notify_reboot(struct not
* and print. */
if (!kgdb_connected || atomic_read(&debugger_active) != 0)
return 0;
- if ((code == SYS_RESTART) || (code == SYS_HALT) || (code ==
SYS_POWER_OFF)){
+ if ((code == SYS_RESTART) || (code == SYS_HALT) ||
+ (code == SYS_POWER_OFF)){
local_irq_save(flags);
put_packet("X00");
local_irq_restore(flags);
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Kgdb-bugreport mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kgdb-bugreport
