build fix -- show_stack
PATCH 1/2 build fix -- show_stack
Hi,
Trivial fix for show_stack() to make 2.5.73 build.
Gerd
arch/x86_64/kernel/traps.c renamed from arch/x86_64/kernel/traps.c.stack +2 -2
@@ -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 )
include/asm-x86_64/proto.h renamed from include/asm-x86_64/proto.h.stack +3 -0
@@ -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);
...
Both fixes are already in 2.5.73-1, released a few seconds ago.
-Andi
Hi,
acpi build fix needed for x86_64 -- make the functions match the prototypes in include/acpi/
Gerd
drivers/acpi/osl.c renamed from drivers/acpi/osl.c.acpi +4 -4
@@ -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. */