diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:57:01 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:57:01 -0500 |
| commit | 734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch) | |
| tree | 507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/lib | |
| parent | 23fd07750a789a66fe88cf173d52a18f1a387da4 (diff) | |
powerpc: apply recent changes to merged code
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/lib')
| -rw-r--r-- | arch/powerpc/lib/locks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c index 4b8c5ad5e7dc..3794715b2972 100644 --- a/arch/powerpc/lib/locks.c +++ b/arch/powerpc/lib/locks.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/stringify.h> | 19 | #include <linux/stringify.h> |
| 20 | #include <linux/smp.h> | ||
| 20 | 21 | ||
| 21 | /* waiting for a spinlock... */ | 22 | /* waiting for a spinlock... */ |
| 22 | #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) | 23 | #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES) |