diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 00:03:03 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-30 00:03:03 -0400 |
| commit | 9b4311eedb17fa88f02e4876cd6aa9a08e383cd6 (patch) | |
| tree | 59cbb1af2c6de429b88818441e31963ec0aad42b /arch/ia64/sn/kernel/sn2/ptc_deadlock.S | |
| parent | 2949ccf9379678df66ecf2ca70ed4656159eacdd (diff) | |
| parent | 0647d8cfd40f7974335884d73deef83feeffc2a0 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/sn/kernel/sn2/ptc_deadlock.S')
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/ptc_deadlock.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S index 7947312801ec..96cb71d15682 100644 --- a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S +++ b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * Copyright (C) 2000-2004 Silicon Graphics, Inc. All rights reserved. | 6 | * Copyright (C) 2000-2004 Silicon Graphics, Inc. All rights reserved. |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <asm/types.h> | ||
| 9 | #include <asm/sn/shub_mmr.h> | 10 | #include <asm/sn/shub_mmr.h> |
| 10 | 11 | ||
| 11 | #define DEADLOCKBIT SH_PIO_WRITE_STATUS_WRITE_DEADLOCK_SHFT | 12 | #define DEADLOCKBIT SH_PIO_WRITE_STATUS_WRITE_DEADLOCK_SHFT |