diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 05:22:26 -0400 |
| commit | 65b53e4cc90e59936733b3b95b9451d2ca47528d (patch) | |
| tree | 29932718192962671c48c3fd1ea017a6112459e8 /include/asm-sparc64/smp.h | |
| parent | 788c0a53164c05c5ccdb1472474372b72ba74644 (diff) | |
| parent | 2e761e0532a784816e7e822dbaaece8c5d4be14d (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/tg3.c
drivers/net/wireless/rt2x00/rt2x00dev.c
net/mac80211/ieee80211_i.h
Diffstat (limited to 'include/asm-sparc64/smp.h')
| -rw-r--r-- | include/asm-sparc64/smp.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h index 1c1c5ea5cea5..cd0311b2e19d 100644 --- a/include/asm-sparc64/smp.h +++ b/include/asm-sparc64/smp.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* smp.h: Sparc64 specific SMP stuff. | 1 | /* smp.h: Sparc64 specific SMP stuff. |
| 2 | * | 2 | * |
| 3 | * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) | 3 | * Copyright (C) 1996, 2008 David S. Miller (davem@davemloft.net) |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #ifndef _SPARC64_SMP_H | 6 | #ifndef _SPARC64_SMP_H |
| @@ -44,6 +44,8 @@ extern int hard_smp_processor_id(void); | |||
| 44 | extern void smp_fill_in_sib_core_maps(void); | 44 | extern void smp_fill_in_sib_core_maps(void); |
| 45 | extern void cpu_play_dead(void); | 45 | extern void cpu_play_dead(void); |
| 46 | 46 | ||
| 47 | extern void smp_fetch_global_regs(void); | ||
| 48 | |||
| 47 | #ifdef CONFIG_HOTPLUG_CPU | 49 | #ifdef CONFIG_HOTPLUG_CPU |
| 48 | extern int __cpu_disable(void); | 50 | extern int __cpu_disable(void); |
| 49 | extern void __cpu_die(unsigned int cpu); | 51 | extern void __cpu_die(unsigned int cpu); |
| @@ -55,6 +57,7 @@ extern void __cpu_die(unsigned int cpu); | |||
| 55 | 57 | ||
| 56 | #define hard_smp_processor_id() 0 | 58 | #define hard_smp_processor_id() 0 |
| 57 | #define smp_fill_in_sib_core_maps() do { } while (0) | 59 | #define smp_fill_in_sib_core_maps() do { } while (0) |
| 60 | #define smp_fetch_global_regs() do { } while (0) | ||
| 58 | 61 | ||
| 59 | #endif /* !(CONFIG_SMP) */ | 62 | #endif /* !(CONFIG_SMP) */ |
| 60 | 63 | ||