diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 09:16:58 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-20 09:16:58 +0300 |
| commit | 497992917edf03994088ec8757b8262e1d9f568a (patch) | |
| tree | 7e82975f98d3d3c9f80e10c981601db23eef5bd1 /include/asm-ia64/sn/xp.h | |
| parent | 7e732bfc5570b8f9bb5f155cf36e94b2e7d6bf6a (diff) | |
| parent | 386d1d50c8eef254653b1015fde06622ef38ba76 (diff) | |
| download | linux-497992917edf03994088ec8757b8262e1d9f568a.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'include/asm-ia64/sn/xp.h')
| -rw-r--r-- | include/asm-ia64/sn/xp.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sn/xp.h b/include/asm-ia64/sn/xp.h index 203945ae034e..9bd2f9bf329b 100644 --- a/include/asm-ia64/sn/xp.h +++ b/include/asm-ia64/sn/xp.h @@ -18,6 +18,7 @@ #include <linux/cache.h> #include <linux/hardirq.h> +#include <linux/mutex.h> #include <asm/sn/types.h> #include <asm/sn/bte.h> @@ -359,7 +360,7 @@ typedef void (*xpc_notify_func)(enum xpc_retval reason, partid_t partid, * the channel. */ struct xpc_registration { - struct semaphore sema; + struct mutex mutex; xpc_channel_func func; /* function to call */ void *key; /* pointer to user's key */ u16 nentries; /* #of msg entries in local msg queue */ |