diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-03-13 15:26:33 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-03-13 15:26:33 +1100 |
| commit | bed04a4413376265746053be2a9cfbfc80c98ec9 (patch) | |
| tree | 8f582294a655f70496cd08aedeb86de31dbad140 /include/asm-sparc64 | |
| parent | e37c772e36a7943b2e0bd8f48312e78474c0df15 (diff) | |
| parent | c463be3520065ef8c05e3cbdf946c69604e91ceb (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/kprobes.h | 2 | ||||
| -rw-r--r-- | include/asm-sparc64/system.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/kprobes.h b/include/asm-sparc64/kprobes.h index 7237dd87663..5879d71afda 100644 --- a/include/asm-sparc64/kprobes.h +++ b/include/asm-sparc64/kprobes.h @@ -14,8 +14,6 @@ typedef u32 kprobe_opcode_t; #define arch_remove_kprobe(p) do {} while (0) -#define ARCH_SUPPORTS_KRETPROBES - #define flush_insn_slot(p) \ do { flushi(&(p)->ainsn.insn[0]); \ flushi(&(p)->ainsn.insn[1]); \ diff --git a/include/asm-sparc64/system.h b/include/asm-sparc64/system.h index ed91a5d8d4f..53eae091a17 100644 --- a/include/asm-sparc64/system.h +++ b/include/asm-sparc64/system.h @@ -30,6 +30,8 @@ enum sparc_cpu { #define ARCH_SUN4C_SUN4 0 #define ARCH_SUN4 0 +extern char reboot_command[]; + /* These are here in an effort to more fully work around Spitfire Errata * #51. Essentially, if a memory barrier occurs soon after a mispredicted * branch, the chip can stop executing instructions until a trap occurs. |