Index: kernel/arch/amd64/src/debugger.c
===================================================================
--- kernel/arch/amd64/src/debugger.c	(revision 4f42d52e33ada8d9034f22f9f731bb5660569488)
+++ kernel/arch/amd64/src/debugger.c	(revision 60133d0afd1e7d9529d61aac6419c1afec8cd212)
@@ -103,5 +103,5 @@
 
 /** Print table of active breakpoints */
-int cmd_print_breakpoints(cmd_arg_t *argv)
+int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
 {
 	int i;
@@ -112,5 +112,5 @@
 		if (breakpoints[i].address) {
 			symbol = get_symtab_entry(breakpoints[i].address);
-			printf("%d. %p in %s\n",i,
+			printf("%d. %lx in %s\n", i,
 			       breakpoints[i].address, symbol);
 			printf("     Count(%d) ", breakpoints[i].counter);
@@ -174,10 +174,9 @@
 /** Enable hardware breakpoint
  *
- *
  * @param where Address of HW breakpoint
  * @param flags Type of breakpoint (EXECUTE, WRITE)
  * @return Debug slot on success, -1 - no available HW breakpoint
  */
-int breakpoint_add(void * where, int flags, int curidx)
+int breakpoint_add(const void *where, const int flags, int curidx)
 {
 	ipl_t ipl;
@@ -185,5 +184,5 @@
 	bpinfo_t *cur;
 
-	ASSERT( flags & (BKPOINT_INSTR | BKPOINT_WRITE | BKPOINT_READ_WRITE));
+	ASSERT(flags & (BKPOINT_INSTR | BKPOINT_WRITE | BKPOINT_READ_WRITE));
 
 	ipl = interrupts_disable();
@@ -192,5 +191,5 @@
 	if (curidx == -1) {
 		/* Find free space in slots */
-		for (i=0; i<BKPOINTS_MAX; i++)
+		for (i = 0; i < BKPOINTS_MAX; i++)
 			if (!breakpoints[i].address) {
 				curidx = i;
@@ -224,7 +223,7 @@
 
 #ifdef amd64
-# define getip(x)  ((x)->rip)
+#	define getip(x)	((x)->rip)
 #else
-# define getip(x)  ((x)->eip)
+#	define getip(x)	((x)->eip)
 #endif
 
@@ -238,12 +237,12 @@
 			if (*((unative_t *) breakpoints[slot].address) != 0)
 				return;
-			printf("**** Found ZERO on address %p ****\n",
-			       slot, breakpoints[slot].address);
+			printf("**** Found ZERO on address %lx (slot %d) ****\n",
+				breakpoints[slot].address, slot);
 		} else {
-			printf("Data watchpoint - new data: %p\n",
+			printf("Data watchpoint - new data: %lx\n",
 			       *((unative_t *) breakpoints[slot].address));
 		}
 	}
-	printf("Reached breakpoint %d:%p(%s)\n", slot, getip(istate),
+	printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
 	       get_symtab_entry(getip(istate)));
 	printf("***Type 'exit' to exit kconsole.\n");
@@ -314,5 +313,5 @@
 #endif
 
-static void debug_exception(int n, istate_t *istate)
+static void debug_exception(int n __attribute__((unused)), istate_t *istate)
 {
 	unative_t dr6;
@@ -338,10 +337,10 @@
 
 #ifdef CONFIG_SMP
-static void debug_ipi(int n, istate_t *istate)
+static void debug_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
 	int i;
 
 	spinlock_lock(&bkpoint_lock);
-	for (i=0; i < BKPOINTS_MAX; i++)
+	for (i = 0; i < BKPOINTS_MAX; i++)
 		setup_dr(i);
 	spinlock_unlock(&bkpoint_lock);