[x86_64 PATCH 1/2] build fix -- show_stack

[x86_64 PATCH 1/2] build fix -- show_stack

[Gerd Knorr]

  Hi,

Trivial fix for show_stack() to make 2.5.73 build.

  Gerd

--- o-linux-2.5.73/arch/x86_64/kernel/traps.c.stack	2003-06-24 12:04:20.000000000 +0200
+++ o-linux-2.5.73/arch/x86_64/kernel/traps.c	2003-06-24 12:16:06.000000000 +0200
@@ -206,7 +206,7 @@
 	show_trace((unsigned long *)rsp);
 }
 
-void show_stack(unsigned long * rsp)
+void show_stack(struct task_struct *task, unsigned long *rsp)
 {
 	unsigned long *stack;
 	int i;
@@ -269,7 +269,7 @@
 	if (in_kernel) {
 
 		printk("Stack: ");
-		show_stack((unsigned long*)rsp);
+		show_stack(current, (unsigned long*)rsp);
 
 		printk("\nCode: ");
 		if(regs->rip < PAGE_OFFSET)
--- o-linux-2.5.73/include/asm-x86_64/proto.h.stack	2003-06-24 12:03:24.000000000 +0200
+++ o-linux-2.5.73/include/asm-x86_64/proto.h	2003-06-24 12:16:30.000000000 +0200
@@ -52,7 +52,10 @@
 
 extern unsigned long cpu_initialized;
 
+#if 0
+// prototype moved to linux/sched.h ...
 extern void show_stack(unsigned long * rsp);
+#endif
 extern void show_trace(unsigned long * rsp);
 extern void show_registers(struct pt_regs *regs);
 

Re: [x86_64 PATCH 1/2] build fix -- show_stack

[Andi Kleen]

...

Both fixes are already in 2.5.73-1, released a few seconds ago.

-Andi

Re: [x86_64 PATCH 2/2] build fix -- show_stack

[Gerd Knorr]

  Hi,

acpi build fix needed for x86_64 -- make the functions match the
prototypes in include/acpi/

  Gerd

--- o-linux-2.5.73/drivers/acpi/osl.c.acpi	2003-06-24 12:24:16.000000000 +0200
+++ o-linux-2.5.73/drivers/acpi/osl.c	2003-06-24 12:24:56.000000000 +0200
@@ -933,8 +933,8 @@
 }
 
 /* Assumes no unreadable holes inbetween */
-BOOLEAN
-acpi_os_readable(void *ptr, u32 len)
+u8
+acpi_os_readable(void *ptr, acpi_size len)
 {
 #if defined(__i386__) || defined(__x86_64__) 
 	char tmp;
@@ -943,8 +943,8 @@
 	return 1;
 }
 
-BOOLEAN
-acpi_os_writable(void *ptr, u32 len)
+u8
+acpi_os_writable(void *ptr, acpi_size len)
 {
 	/* could do dummy write (racy) or a kernel page table lookup.
 	   The later may be difficult at early boot when kmap doesn't work yet. */