Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 120804
b: refs/heads/master
c: c370e5e
h: refs/heads/master
v: v3
  • Loading branch information
Eduardo Habkost authored and Ingo Molnar committed Nov 12, 2008
1 parent 5d7bd9c commit 38cafa7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8e294786316aca41c66b8b73ba1ee74a4ae7d452
refs/heads/master: c370e5e089adfd5b1b863f3464cccae9ebf33cca
5 changes: 5 additions & 0 deletions trunk/arch/x86/include/asm/reboot.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef _ASM_X86_REBOOT_H
#define _ASM_X86_REBOOT_H

#include <linux/kdebug.h>

struct pt_regs;

struct machine_ops {
Expand All @@ -18,4 +20,7 @@ void native_machine_crash_shutdown(struct pt_regs *regs);
void native_machine_shutdown(void);
void machine_real_restart(const unsigned char *code, int length);

typedef void (*nmi_shootdown_cb)(int, struct die_args*);
void nmi_shootdown_cpus(nmi_shootdown_cb callback);

#endif /* _ASM_X86_REBOOT_H */
3 changes: 1 addition & 2 deletions trunk/arch/x86/kernel/crash.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@

#include <mach_ipi.h>

typedef void (*nmi_shootdown_cb)(int, struct die_args*);

#if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)

Expand Down Expand Up @@ -100,7 +99,7 @@ static struct notifier_block crash_nmi_nb = {
.notifier_call = crash_nmi_callback,
};

static void nmi_shootdown_cpus(nmi_shootdown_cb callback)
void nmi_shootdown_cpus(nmi_shootdown_cb callback)
{
unsigned long msecs;

Expand Down

0 comments on commit 38cafa7

Please sign in to comment.