diff options
| author | Linus Torvalds | 2008-10-13 19:07:53 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-10-13 19:07:53 +0200 |
| commit | 5723ff931a94acf0738df42604ee89f852e151b0 (patch) | |
| tree | 99be1b14cd5f2b5e987773a9271627b746f84a4b /arch/sparc | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
| parent | chmc: Mark %ver register inline asm with __volatile__ (diff) | |
| download | kernel-qcow2-linux-5723ff931a94acf0738df42604ee89f852e151b0.tar.gz kernel-qcow2-linux-5723ff931a94acf0738df42604ee89f852e151b0.tar.xz kernel-qcow2-linux-5723ff931a94acf0738df42604ee89f852e151b0.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
chmc: Mark %ver register inline asm with __volatile__
sparc64: Add missing notify_cpu_starting() call.
sparc32: fix build errors
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/sun4d_smp.c | 1 | ||||
| -rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/sun4d_smp.c b/arch/sparc/kernel/sun4d_smp.c index ce3d45db94e9..7a6a5e795928 100644 --- a/arch/sparc/kernel/sun4d_smp.c +++ b/arch/sparc/kernel/sun4d_smp.c @@ -20,6 +20,7 @@ #include <linux/swap.h> #include <linux/profile.h> #include <linux/delay.h> +#include <linux/cpu.h> #include <asm/ptrace.h> #include <asm/atomic.h> diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 0c564ba9e709..5fc386d08c47 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c @@ -17,6 +17,7 @@ #include <linux/swap.h> #include <linux/profile.h> #include <linux/delay.h> +#include <linux/cpu.h> #include <asm/cacheflush.h> #include <asm/tlbflush.h> |